[Getdata-commits] SF.net SVN: getdata:[759] trunk/getdata

[<ket...@us...>]

Revision: 759
          http://getdata.svn.sourceforge.net/getdata/?rev=759&view=rev
Author:   ketiltrout
Date:     2012-08-15 01:29:50 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
GetData-0.8.1rc1: Remove improper restrict keywords.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/NEWS
    trunk/getdata/m4/version.m4
    trunk/getdata/src/internal.h
    trunk/getdata/src/parse.c

Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog	2012-08-14 22:27:24 UTC (rev 758)
+++ trunk/getdata/ChangeLog	2012-08-15 01:29:50 UTC (rev 759)
@@ -1,4 +1,10 @@
-2012-08-04   D. V. Wiebe <ge...@ke...> svn:757
+2012-08-15   D. V. Wiebe <ge...@ke...> svn:759
+	GetData-0.8.1rc1:
+
+	* src/parse.c (_GD_ParseDirective _GD_ParseFragment): Remove inappropriate
+	restrict keywords.  Reported by Daniel Flanigan.
+
+2012-08-14   D. V. Wiebe <ge...@ke...> svn:757
 	* src/include.c (_GD_Include): Return the correct fragment index, not just
 	D->n_fragment - 1.
 	* test/include_sub.c: Added.

Modified: trunk/getdata/NEWS
===================================================================
--- trunk/getdata/NEWS	2012-08-14 22:27:24 UTC (rev 758)
+++ trunk/getdata/NEWS	2012-08-15 01:29:50 UTC (rev 759)
@@ -1,4 +1,4 @@
-New in version 0.8.1:
+New in version 0.8.1rc1:
 
   Library Changes:
 
@@ -16,6 +16,10 @@
   * BUG FIX: The parser now fails properly on /INCLUDEs which specify paths
     which don't point to regular files.
 
+  * BUG FIX: Fixed a bug which would result in the parser getting confused over
+    the current Standards Version, potentially leading to rejected valid
+    dirfiles.  Reported by Daniel Flanigan.
+
   * WIN32 BUG FIX: On Windows, the parser can now properly handle hexadecimal
     floating point.
 

Modified: trunk/getdata/m4/version.m4
===================================================================
--- trunk/getdata/m4/version.m4	2012-08-14 22:27:24 UTC (rev 758)
+++ trunk/getdata/m4/version.m4	2012-08-15 01:29:50 UTC (rev 759)
@@ -20,23 +20,23 @@
 
 m4_define(getdata_major,    0)
 m4_define(getdata_minor,    8)
-m4_define(getdata_revision, 0)
-m4_define(getdata_extra,    [])
+m4_define(getdata_revision, 1)
+m4_define(getdata_extra,    [rc1])
 m4_define(getdata_version,
           getdata_major.getdata_minor.getdata_revision[]getdata_extra)
 
 dnl libgetdata current interface version
-m4_define(getdata_iface_version,    5)
+m4_define(getdata_iface_version,    6)
 dnl libgetdata current interface implementation revision
 m4_define(getdata_impl_revision,    0)
 dnl libgetdata interface age (current interface - oldest supported interface)
-m4_define(getdata_iface_age,        0)
+m4_define(getdata_iface_age,        1)
 
 dnl libgetdata++ interface version info
-m4_define(getdataxx_version, 3:0:0)
+m4_define(getdataxx_version, 4:0:1)
 
 dnl libfgetdata interface version info
-m4_define(fgetdata_version, 3:0:1)
+m4_define(fgetdata_version, 4:0:2)
 
 dnl libf95getdata interface version info
-m4_define(f95getdata_version, 3:0:1)
+m4_define(f95getdata_version, 4:0:2)

Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h	2012-08-14 22:27:24 UTC (rev 758)
+++ trunk/getdata/src/internal.h	2012-08-15 01:29:50 UTC (rev 759)
@@ -1114,8 +1114,8 @@
 gd_entry_t *_GD_ParseFieldSpec(DIRFILE *restrict, int, char**,
     const gd_entry_t *restrict, const char *restrict, int, int, int, int,
     unsigned long, int, char**, const char*);
-char *_GD_ParseFragment(FILE *restrict, DIRFILE *restrict, int, int *restrict,
-    unsigned long int *restrict, int);
+char *_GD_ParseFragment(FILE *restrict, DIRFILE *, int, int *restrict,
+    unsigned long int *, int);
 void _GD_ReadLinterpFile(DIRFILE *restrict, gd_entry_t *restrict);
 void *_GD_Realloc(DIRFILE *restrict, void *restrict, size_t size);
 void _GD_ReleaseDir(DIRFILE *D, int dirfd);

Modified: trunk/getdata/src/parse.c
===================================================================
--- trunk/getdata/src/parse.c	2012-08-14 22:27:24 UTC (rev 758)
+++ trunk/getdata/src/parse.c	2012-08-15 01:29:50 UTC (rev 759)
@@ -1978,9 +1978,9 @@
 /* _GD_ParseDirective: Actually parse a single format file line.
  *       Returns 1 if a match was made.
  */
-static int _GD_ParseDirective(DIRFILE *restrict D, char **in_cols, int n_cols,
+static int _GD_ParseDirective(DIRFILE *D, char **in_cols, int n_cols,
     int me, int *restrict standards, int linenum, char **restrict ref_name,
-    unsigned long *restrict flags, char **outstring, const char *tok_pos)
+    unsigned long *flags, char **outstring, const char *tok_pos)
 {
   const char* ptr;
   char *munged_code;
@@ -2257,8 +2257,8 @@
  *
  *       Returns NULL unless this fragment contains a REFERENCE directive.
  */
-char *_GD_ParseFragment(FILE *restrict fp, DIRFILE *restrict D, int me,
-    int *restrict standards, unsigned long *restrict flags, int resolve)
+char *_GD_ParseFragment(FILE *restrict fp, DIRFILE *D, int me,
+    int *restrict standards, unsigned long *flags, int resolve)
 {
   char *instring = NULL;
   char *outstring = NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.