[SCM] shapelib branch, master, updated. debian/1.2.10-7-5-g2b80d4e
Arto Jantunen
viiru at debian.org
Sun Nov 10 09:45:03 UTC 2013
The following commit has been merged in the master branch:
commit ea6957973db15701cec494f4aa0c67b3670fd28c
Author: Arto Jantunen <viiru at debian.org>
Date: Fri Sep 6 13:24:49 2013 +0300
Remove patch 0002 (Thread safety fixes), no longer needed
diff --git a/debian/patches/0002-Thread-safety-fixes.patch b/debian/patches/0002-Thread-safety-fixes.patch
deleted file mode 100644
index 5468df4..0000000
--- a/debian/patches/0002-Thread-safety-fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From: M Joonas Pihlaja <jpihlaja at cc.helsinki.fi>
-Date: Fri, 8 Apr 2005 10:51:19 +0200
-Subject: [PATCH] Thread safety fixes
-
----
- dbfopen.c | 60 +++++++++++++++++++++++++++++++++---------------------------
- shapefil.h | 5 +++++
- 2 files changed, 38 insertions(+), 27 deletions(-)
-
-diff --git a/dbfopen.c b/dbfopen.c
-index 43b25ac..178ae18 100644
---- a/dbfopen.c
-+++ b/dbfopen.c
-@@ -197,8 +197,6 @@ static char rcsid[] =
- # define TRUE 1
- #endif
-
--static int nStringFieldLen = 0;
--static char * pszStringField = NULL;
-
- /************************************************************************/
- /* SfRealloc() */
-@@ -431,6 +429,12 @@ DBFOpen( const char * pszFilename, const char * pszAccess )
- psDBF->panFieldOffset[iField-1] + psDBF->panFieldSize[iField-1];
- }
-
-+/* -------------------------------------------------------------------- */
-+/* Initialize our temporary input fields. */
-+/* -------------------------------------------------------------------- */
-+ psDBF->nStringFieldLen = 0;
-+ psDBF->pszStringField = NULL;
-+
- return( psDBF );
- }
-
-@@ -489,14 +493,12 @@ DBFClose(DBFHandle psDBF)
- free( psDBF->pszHeader );
- free( psDBF->pszCurrentRecord );
-
-- free( psDBF );
--
-- if( pszStringField != NULL )
-+ if( psDBF->pszStringField != NULL )
- {
-- free( pszStringField );
-- pszStringField = NULL;
-- nStringFieldLen = 0;
-+ free( psDBF->pszStringField );
- }
-+
-+ free( psDBF );
- }
-
- /************************************************************************/
-@@ -571,6 +573,12 @@ DBFCreate( const char * pszFilename )
-
- psDBF->bNoHeader = TRUE;
-
-+/* --------------------------------------------------------------------*/
-+/* Initialize our temporary input fields.*/
-+/* --------------------------------------------------------------------*/
-+ psDBF->nStringFieldLen = 0;
-+ psDBF->pszStringField = NULL;
-+
- return( psDBF );
- }
-
-@@ -691,7 +699,6 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
- unsigned char *pabyRec;
- void *pReturnField = NULL;
-
-- static double dDoubleField;
-
- /* -------------------------------------------------------------------- */
- /* Verify selection. */
-@@ -734,30 +741,31 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
- /* -------------------------------------------------------------------- */
- /* Ensure our field buffer is large enough to hold this buffer. */
- /* -------------------------------------------------------------------- */
-- if( psDBF->panFieldSize[iField]+1 > nStringFieldLen )
-+ if( psDBF->panFieldSize[iField]+1 > psDBF->nStringFieldLen )
- {
-- nStringFieldLen = psDBF->panFieldSize[iField]*2 + 10;
-- pszStringField = (char *) SfRealloc(pszStringField,nStringFieldLen);
-+ psDBF->nStringFieldLen = psDBF->panFieldSize[iField]*2 + 10;
-+ psDBF->pszStringField = (char *) SfRealloc(psDBF->pszStringField,
-+ psDBF->nStringFieldLen);
- }
-
- /* -------------------------------------------------------------------- */
- /* Extract the requested field. */
- /* -------------------------------------------------------------------- */
-- strncpy( pszStringField,
-+ strncpy( psDBF->pszStringField,
- ((const char *) pabyRec) + psDBF->panFieldOffset[iField],
- psDBF->panFieldSize[iField] );
-- pszStringField[psDBF->panFieldSize[iField]] = '\0';
-+ psDBF->pszStringField[psDBF->panFieldSize[iField]] = '\0';
-
-- pReturnField = pszStringField;
-+ pReturnField = psDBF->pszStringField;
-
- /* -------------------------------------------------------------------- */
- /* Decode the field. */
- /* -------------------------------------------------------------------- */
- if( chReqType == 'N' )
- {
-- dDoubleField = atof(pszStringField);
-+ psDBF->dDoubleField = atof(psDBF->pszStringField);
-
-- pReturnField = &dDoubleField;
-+ pReturnField = &psDBF->dDoubleField;
- }
-
- /* -------------------------------------------------------------------- */
-@@ -768,7 +776,7 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
- {
- char *pchSrc, *pchDst;
-
-- pchDst = pchSrc = pszStringField;
-+ pchDst = pchSrc = psDBF->pszStringField;
- while( *pchSrc == ' ' )
- pchSrc++;
-
-@@ -776,7 +784,7 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
- *(pchDst++) = *(pchSrc++);
- *pchDst = '\0';
-
-- while( pchDst != pszStringField && *(--pchDst) == ' ' )
-+ while( pchDst != psDBF->pszStringField && *(--pchDst) == ' ' )
- *pchDst = '\0';
- }
- #endif
-@@ -1351,9 +1359,6 @@ DBFReadTuple(DBFHandle psDBF, int hEntity )
- {
- int nRecordOffset;
- unsigned char *pabyRec;
-- static char *pReturnTuple = NULL;
--
-- static int nTupleLen = 0;
-
- /* -------------------------------------------------------------------- */
- /* Have we read the record? */
-@@ -1375,14 +1380,15 @@ DBFReadTuple(DBFHandle psDBF, int hEntity )
-
- pabyRec = (unsigned char *) psDBF->pszCurrentRecord;
-
-- if ( nTupleLen < psDBF->nRecordLength) {
-- nTupleLen = psDBF->nRecordLength;
-- pReturnTuple = (char *) SfRealloc(pReturnTuple, psDBF->nRecordLength);
-+ if ( psDBF->nStringFieldLen < psDBF->nRecordLength) {
-+ psDBF->nStringFieldLen = psDBF->nRecordLength;
-+ psDBF->pszStringField = (char *) SfRealloc(psDBF->pszStringField,
-+ psDBF->nRecordLength);
- }
-
-- memcpy ( pReturnTuple, pabyRec, psDBF->nRecordLength );
-+ memcpy ( psDBF->pszStringField, pabyRec, psDBF->nRecordLength );
-
-- return( pReturnTuple );
-+ return( psDBF->pszStringField );
- }
-
- /************************************************************************/
-diff --git a/shapefil.h b/shapefil.h
-index 19ba921..0244ba1 100644
---- a/shapefil.h
-+++ b/shapefil.h
-@@ -401,6 +401,11 @@ typedef struct
-
- int bNoHeader;
- int bUpdated;
-+
-+ int nStringFieldLen;
-+ char *pszStringField;
-+
-+ double dDoubleField;
- } DBFInfo;
-
- typedef DBFInfo * DBFHandle;
---
diff --git a/debian/patches/series b/debian/patches/series
index 08694c6..61243bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-Add-manpages.patch
-0002-Thread-safety-fixes.patch
0003-Properly-use-libtool.patch
0004-Dynamically-link-the-shp-binaries-to-libshp.patch
0005-Stop-setting-CFLAGS-in-the-Makefile.patch
--
Library for reading and writing ArcView Shapefiles
More information about the Pkg-grass-devel
mailing list