[Pspp-cvs] pspp/src data/casefile.c language/line-buffer.h...

[John Darrington]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/07/10 09:28:14

Modified files:
        src/data       : casefile.c 
        src/language   : line-buffer.h 
        src/libpspp    : ChangeLog llx.c 

Log message:
        Minor cleanup and spot fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casefile.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/line-buffer.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/llx.c?cvsroot=pspp&r1=1.1&r2=1.2

Patches:
Index: data/casefile.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/casefile.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- data/casefile.c     19 Jun 2006 10:16:51 -0000      1.12
+++ data/casefile.c     10 Jul 2006 09:28:14 -0000      1.13
@@ -356,6 +356,8 @@
   assert (c != NULL);
   assert (cf->mode == WRITE);
 
+  assert ( cf->value_cnt <= c->case_data->value_cnt );
+
   /* Try memory first. */
   if (cf->storage == MEMORY) 
     {

Index: language/line-buffer.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/line-buffer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/line-buffer.h      4 Jul 2006 04:39:04 -0000       1.4
+++ language/line-buffer.h      10 Jul 2006 09:28:14 -0000      1.5
@@ -64,5 +64,7 @@
 struct msg_locator;
 void get_msg_location (struct msg_locator *loc);
 
+void getl_location (const char **fn, int *ln);
+
 
 #endif /* line-buffer.h */

Index: libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libpspp/ChangeLog   8 Jul 2006 03:05:52 -0000       1.32
+++ libpspp/ChangeLog   10 Jul 2006 09:28:14 -0000      1.33
@@ -1,3 +1,7 @@
+Mon Jul 10 17:26:58 WST 2006 John Darrington <address@hidden>
+
+       * llx.c: #included compiler.h and removed explicit preprocessor cruft.
+
 Fri Jul  7 20:01:26 2006  Ben Pfaff  <address@hidden>
 
        * automake.mk: (src_libpspp_libpspp_a_SOURCES) Add assertion.h.

Index: libpspp/llx.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/llx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libpspp/llx.c       1 Jul 2006 22:34:27 -0000       1.1
+++ libpspp/llx.c       10 Jul 2006 09:28:14 -0000      1.2
@@ -32,15 +32,10 @@
 #endif
 
 #include <libpspp/llx.h>
+#include "compiler.h"
 #include <assert.h>
 #include <stdlib.h>
 
-#if __GNUC__ >= 2 && !defined UNUSED
-#define UNUSED __attribute__ ((unused))
-#else
-#define UNUSED
-#endif
-
 /* Destroys LIST and frees all of its nodes using MANAGER.
    If DESTRUCTOR is non-null, each node in the list will be
    passed to it in list order, with AUX as auxiliary data, before