Changeset 10975

Show
Ignore:
Timestamp:
03/15/07 21:20:09 (2 years ago)
Author:
mloskot
Message:

Fixed dangerous typo made while fixing Bug 1521. Display strerror() message on Shapelib writing failures.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp

    r10972 r10975  
    926926        CPLMalloc(sizeof(int)*(nTotalShapeCount+1)); 
    927927    int nDeleteCount = 0; 
    928     int iShape; 
     928    int iShape = 0; 
    929929    OGRErr eErr = OGRERR_NONE; 
    930930 
    …… 
    10961096/* in the right place and accessible. 
    10971097/* -------------------------------------------------------------------- */ 
    1098     CPLAssert( NULL == hSHP ); 
    1099     CPLAssert( NULL == hDBF ); 
     1098    CPLAssert( NULL == hSHP && NULL == hNewSHP ); 
     1099    CPLAssert( NULL == hDBF && NULL == hNewDBF ); 
    11001100     
    11011101    CPLPushErrorHandler( CPLQuietErrorHandler ); 
    …… 
    11071107        pszAccess = "r"; 
    11081108     
    1109     hSHP = SHPOpen ( CPLResetExtension( pszFullName, "shp" ) , "r" ); 
    1110     hDBF = DBFOpen ( CPLResetExtension( pszFullName, "dbf" ) , "r" ); 
     1109    hSHP = SHPOpen ( CPLResetExtension( pszFullName, "shp" ) , pszAccess ); 
     1110    hDBF = DBFOpen ( CPLResetExtension( pszFullName, "dbf" ) , pszAccess ); 
    11111111     
    11121112    CPLPopErrorHandler(); 

  • trunk/gdal/ogr/ogrsf_frmts/shape/shpopen.c

    r9986 r10975  
    344344#ifdef USE_CPL 
    345345        CPLError( CE_Failure, CPLE_OpenFailed,  
    346                   "Failure writing .shp header." ); 
     346                  "Failure writing .shp header (%s)", strerror( errno ) ); 
    347347#endif 
    348348        return; 
    …… 
    361361#ifdef USE_CPL 
    362362        CPLError( CE_Failure, CPLE_OpenFailed,  
    363                   "Failure writing .shx header." ); 
     363                  "Failure writing .shx header (%s)", strerror( errno ) ); 
    364364#endif 
    365365        return; 
    …… 
    384384#ifdef USE_CPL 
    385385        CPLError( CE_Failure, CPLE_OpenFailed,  
    386                   "Failure writing .shx contents." ); 
     386                  "Failure writing .shx contents (%s)", strerror( errno ) ); 
    387387#endif 
    388388    }