[postgis-commits] svn - r2785 - trunk/loader

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-05-27 08:08:20 -0700 (Tue, 27 May 2008)
New Revision: 2785

Modified:
   trunk/loader/dbfopen.c
   trunk/loader/shapefil.h
   trunk/loader/shpopen.c
Log:
Remove extra warnings related to the shp2pgsql deleted records patch

Modified: trunk/loader/dbfopen.c
===================================================================
--- trunk/loader/dbfopen.c	2008-05-27 14:47:06 UTC (rev 2784)
+++ trunk/loader/dbfopen.c	2008-05-27 15:08:20 UTC (rev 2785)
@@ -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: trunk/loader/shapefil.h
===================================================================
--- trunk/loader/shapefil.h	2008-05-27 14:47:06 UTC (rev 2784)
+++ trunk/loader/shapefil.h	2008-05-27 15:08:20 UTC (rev 2785)
@@ -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

Modified: trunk/loader/shpopen.c
===================================================================
--- trunk/loader/shpopen.c	2008-05-27 14:47:06 UTC (rev 2784)
+++ trunk/loader/shpopen.c	2008-05-27 15:08:20 UTC (rev 2785)
@@ -173,9 +173,6 @@
  *
  */
 
-static char rcsid[] = 
-  "$Id$";
-
 #include "shapefil.h"
 
 #include <math.h>