[postgis-commits] svn - r2786 - branches/1.3/loader

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2008-05-27 10:14:43 -0700 (Tue, 27 May 2008)
New Revision: 2786

Modified:
   branches/1.3/loader/dbfopen.c
   branches/1.3/loader/shapefil.h
Log:
Pull trunk changes back into 1.3 branch.


Modified: branches/1.3/loader/dbfopen.c
===================================================================
--- branches/1.3/loader/dbfopen.c	2008-05-27 15:08:20 UTC (rev 2785)
+++ branches/1.3/loader/dbfopen.c	2008-05-27 17:14:43 UTC (rev 2786)
@@ -776,10 +776,9 @@
 int DBFReadDeleted(DBFHandle psDBF, int hEntity)
 {
   unsigned char	*pabyRec;
-  unsigned char *pDeleted;
   
   if( ! DBFReadSetup( psDBF, hEntity) )
-    return NULL;
+    return 0;
 
   /* get reference to current record */
   pabyRec = (unsigned char *) psDBF->pszCurrentRecord;

Modified: branches/1.3/loader/shapefil.h
===================================================================
--- branches/1.3/loader/shapefil.h	2008-05-27 15:08:20 UTC (rev 2785)
+++ branches/1.3/loader/shapefil.h	2008-05-27 17:14:43 UTC (rev 2786)
@@ -456,6 +456,8 @@
 int     SHPAPI_CALL
       DBFIsAttributeNULL( DBFHandle hDBF, int iShape, int iField );
 
+int SHPAPI_CALL DBFReadSetup(DBFHandle psDBF, int hEntity);
+
 int SHPAPI_CALL DBFReadDeleted(DBFHandle psDBF, int hEntity);
 
 int SHPAPI_CALL