From 8c8b1ba6eadf4cf533b5cce513a21b48ae06c402 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 10 Jul 2006 09:28:14 +0000 Subject: [PATCH] Minor cleanup and spot fixes. --- src/data/casefile.c | 2 ++ src/language/line-buffer.h | 2 ++ src/libpspp/ChangeLog | 4 ++++ src/libpspp/llx.c | 7 +------ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/data/casefile.c b/src/data/casefile.c index 7681a65f..298990b7 100644 --- 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 db9076c5..25845ca8 100644 --- 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 0d700060..5888895b 100644 --- a/src/libpspp/ChangeLog +++ b/src/libpspp/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 10 17:26:58 WST 2006 John Darrington + + * llx.c: #included compiler.h and removed explicit preprocessor cruft. + Fri Jul 7 20:01:26 2006 Ben Pfaff * automake.mk: (src_libpspp_libpspp_a_SOURCES) Add assertion.h. diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c index 2f970bf7..c64393a7 100644 --- a/src/libpspp/llx.c +++ b/src/libpspp/llx.c @@ -32,15 +32,10 @@ #endif #include +#include "compiler.h" #include #include -#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 -- 2.30.2