Minor cleanup and spot fixes.

diff --git a/src/data/casefile.c b/src/data/casefile.c
index 7681a65f9d4e3e33b1c272760ed33ea0bc78e621..298990b752b0c9e5cb527ed9bd07ebe8c899a545 100644 (file)
--- a/src/data/casefile.c
+++ b/src/data/casefile.c
@@ -356,6 +356,8 @@ casefile_append (struct casefile *cf, const struct ccase *c)
   assert (c != NULL);
   assert (cf->mode == WRITE);
 
+  assert ( cf->value_cnt <= c->case_data->value_cnt );
+
   /* Try memory first. */
   if (cf->storage == MEMORY) 
     {

diff --git a/src/language/line-buffer.h b/src/language/line-buffer.h
index db9076c55ef58296fc49f6381f8cb65a1611d61a..25845ca836d03cd957f806fcf000aecfbdecf50b 100644 (file)
--- a/src/language/line-buffer.h
+++ b/src/language/line-buffer.h
@@ -64,5 +64,7 @@ void getl_set_prompt_style (enum getl_prompt_style);
 struct msg_locator;
 void get_msg_location (struct msg_locator *loc);
 
+void getl_location (const char **fn, int *ln);
+
 
 #endif /* line-buffer.h */

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 0d70006098b916d241f891c7c48876997334926a..5888895b83968db29d673e9c9a30b09e8834e54e 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 10 17:26:58 WST 2006 John Darrington <john@darrington.wattle.id.au>
+
+       * llx.c: #included compiler.h and removed explicit preprocessor cruft.
+
 Fri Jul  7 20:01:26 2006  Ben Pfaff  <blp@gnu.org>
 
        * automake.mk: (src_libpspp_libpspp_a_SOURCES) Add assertion.h.

diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c
index 2f970bf70ad052777663631244955b6d4403a645..c64393a76010f2bb700e92f90fae058ee5d16c71 100644 (file)
--- a/src/libpspp/llx.c
+++ b/src/libpspp/llx.c
@@ -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