Remove extra warnings related to the shp2pgsql deleted records patch

git-svn-id: http://svn.osgeo.org/postgis/trunk@2785 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/loader/dbfopen.c b/loader/dbfopen.c
index 337f2eb6ef21fea7079edd9c1077715851783e98..80fab3544546015e18dc633d819a917ec7f6040b 100644 (file)
--- a/loader/dbfopen.c
+++ b/loader/dbfopen.c
@@ -776,10 +776,9 @@ int DBFReadSetup(DBFHandle psDBF, int hEntity)
 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;

diff --git a/loader/shapefil.h b/loader/shapefil.h
index 34908b177fc9fbf69abcee7ce017cc3f4e594bfa..332aa547eac6435295103f2548dcd08e9feddccd 100644 (file)
--- a/loader/shapefil.h
+++ b/loader/shapefil.h
@@ -456,6 +456,8 @@ const char SHPAPI_CALL1(*)
 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

diff --git a/loader/shpopen.c b/loader/shpopen.c
index 599ccaf89b0e67c2eabc205f335b6c8775f29dcc..203c3232978025800781f083bfa5ec58b2c3cc48 100644 (file)
--- a/loader/shpopen.c
+++ b/loader/shpopen.c
@@ -173,9 +173,6 @@
  *
  */
 
-static char rcsid[] = 
-  "$Id$";
-
 #include "shapefil.h"
 
 #include <math.h>