[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src ChangeLog message.c data/ChangeLog dat...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src ChangeLog message.c data/ChangeLog dat... |
|
Date: |
Mon, 24 Apr 2006 05:10:00 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch:
Changes by: Ben Pfaff <address@hidden> 06/04/24 05:10:00
Modified files:
src : ChangeLog message.c
src/data : ChangeLog casefile.c data-in.c
por-file-reader.c sys-file-reader.c
src/language/data-io: ChangeLog data-list.c
src/language/expressions: ChangeLog helpers.c
src/libpspp : ChangeLog message.h
src/ui/gui : ChangeLog message-dialog.c
Log message:
Continue reforming error message support. In this phase, get rid of
message "titles" and put the message text in `struct error'. Now
`struct error' encapsulates a message more properly.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ChangeLog.diff?tr1=1.272&tr2=1.273&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/message.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/casefile.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/data-in.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/por-file-reader.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-reader.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/helpers.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/ChangeLog.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/message.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/message-dialog.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.272 pspp/src/ChangeLog:1.273
--- pspp/src/ChangeLog:1.272 Mon Apr 24 03:45:41 2006
+++ pspp/src/ChangeLog Mon Apr 24 05:09:59 2006
@@ -1,3 +1,15 @@
+Sun Apr 23 22:00:23 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * message.c: (tmsg) Removed.
+ (msg) Use err_msg() instead of err_vmsg(). Format message
+ ourselves.
+ (err_vmsg) Renamed err_msg(). Changed interface, dropping message
+ and va_list args which are now in the error struct.
+
Sun Apr 23 20:35:28 2006 Ben Pfaff <address@hidden>
Continue reforming error message support.
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.19 pspp/src/data/ChangeLog:1.20
--- pspp/src/data/ChangeLog:1.19 Mon Apr 17 02:13:38 2006
+++ pspp/src/data/ChangeLog Mon Apr 24 05:10:00 2006
@@ -1,3 +1,18 @@
+Sun Apr 23 22:04:45 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * casefile.c: (io_error) Use err_msg() instead of err_vmsg().
+ Format message ourselves.
+
+ * data-in.c: (vdls_error) Ditto.
+
+ * por-file-reader.c: (error) Ditto.
+
+ * sys-file-reader.c: (corrupt_msg) Ditto.
+
Sun Apr 16 18:49:51 2006 Ben Pfaff <address@hidden>
GNU standards require "file name" instead of "filename" in
Index: pspp/src/data/casefile.c
diff -u pspp/src/data/casefile.c:1.5 pspp/src/data/casefile.c:1.6
--- pspp/src/data/casefile.c:1.5 Mon Apr 17 03:49:48 2006
+++ pspp/src/data/casefile.c Mon Apr 24 05:10:00 2006
@@ -740,11 +740,11 @@
e.severity = MSG_ERROR;
e.where.file_name = NULL;
e.where.line_number = -1;
- e.title = NULL;
-
va_start (args, format);
- err_vmsg (&e, format, args);
+ e.text = xvasprintf (format, args);
va_end (args);
+
+ err_msg (&e);
}
cf->ok = false;
}
Index: pspp/src/data/data-in.c
diff -u pspp/src/data/data-in.c:1.5 pspp/src/data/data-in.c:1.6
--- pspp/src/data/data-in.c:1.5 Mon Apr 17 03:49:48 2006
+++ pspp/src/data/data-in.c Mon Apr 24 05:10:00 2006
@@ -49,26 +49,25 @@
vdls_error (const struct data_in *i, const char *format, va_list args)
{
struct error e;
- struct string title;
+ struct string text;
if (i->flags & DI_IGNORE_ERROR)
return;
- ds_init (&title, 64);
+ ds_init (&text, 64);
if (i->f1 == i->f2)
- ds_printf (&title, _("(column %d"), i->f1);
+ ds_printf (&text, _("(column %d"), i->f1);
else
- ds_printf (&title, _("(columns %d-%d"), i->f1, i->f2);
- ds_printf (&title, _(", field type %s) "), fmt_to_string (&i->format));
+ ds_printf (&text, _("(columns %d-%d"), i->f1, i->f2);
+ ds_printf (&text, _(", field type %s) "), fmt_to_string (&i->format));
+ ds_vprintf (&text, format, args);
e.category = MSG_DATA;
e.severity = MSG_ERROR;
err_location (&e.where);
- e.title = ds_c_str (&title);
+ e.text = ds_c_str (&text);
- err_vmsg (&e, format, args);
-
- ds_destroy (&title);
+ err_msg (&e);
}
static void
Index: pspp/src/data/por-file-reader.c
diff -u pspp/src/data/por-file-reader.c:1.7 pspp/src/data/por-file-reader.c:1.8
--- pspp/src/data/por-file-reader.c:1.7 Mon Apr 17 03:49:48 2006
+++ pspp/src/data/por-file-reader.c Mon Apr 24 05:10:00 2006
@@ -86,22 +86,23 @@
error (struct pfm_reader *r, const char *msg, ...)
{
struct error e;
- const char *file_name;
- char *title;
+ struct string text;
va_list args;
+ ds_init (&text, 64);
+ ds_printf (&text, _("portable file %s corrupt at offset %ld: "),
+ fh_get_file_name (r->fh), ftell (r->file));
+ va_start (args, msg);
+ ds_vprintf (&text, msg, args);
+ va_end (args);
+
e.category = MSG_GENERAL;
e.severity = MSG_ERROR;
e.where.file_name = NULL;
e.where.line_number = 0;
- file_name = fh_get_file_name (r->fh);
- e.title = title = pool_alloc (r->pool, strlen (file_name) + 80);
- sprintf (title, _("portable file %s corrupt at offset %ld: "),
- file_name, ftell (r->file));
-
- va_start (args, msg);
- err_vmsg (&e, msg, args);
- va_end (args);
+ e.text = ds_c_str (&text);
+
+ err_msg (&e);
r->ok = false;
Index: pspp/src/data/sys-file-reader.c
diff -u pspp/src/data/sys-file-reader.c:1.10
pspp/src/data/sys-file-reader.c:1.11
--- pspp/src/data/sys-file-reader.c:1.10 Mon Apr 17 03:49:48 2006
+++ pspp/src/data/sys-file-reader.c Mon Apr 24 05:10:00 2006
@@ -125,16 +125,20 @@
{
struct error e;
va_list args;
+ struct string text;
+
+ ds_create (&text, _("corrupt system file: "));
+ va_start (args, format);
+ ds_vprintf (&text, format, args);
+ va_end (args);
e.category = msg_class_to_category (class);
e.severity = msg_class_to_severity (class);
e.where.file_name = NULL;
e.where.line_number = 0;
- e.title = _("corrupt system file: ");
+ e.text = ds_c_str (&text);
- va_start (args, format);
- err_vmsg (&e, format, args);
- va_end (args);
+ err_msg (&e);
}
/* Closes a system file after we're done with it. */
Index: pspp/src/language/data-io/ChangeLog
diff -u pspp/src/language/data-io/ChangeLog:1.3
pspp/src/language/data-io/ChangeLog:1.4
--- pspp/src/language/data-io/ChangeLog:1.3 Sun Apr 16 02:42:39 2006
+++ pspp/src/language/data-io/ChangeLog Mon Apr 24 05:10:00 2006
@@ -1,3 +1,13 @@
+Sun Apr 23 22:05:58 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * data-list.c: (macro RPD_ERR) Removed.
+ (rpd_msg) New function. Updated all references to tmsg() to call
+ this function instead.
+
Sat Apr 15 19:38:13 2006 Ben Pfaff <address@hidden>
Remove last users of struct file_ext so we can get rid of it
Index: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.7
pspp/src/language/data-io/data-list.c:1.8
--- pspp/src/language/data-io/data-list.c:1.7 Sun Apr 16 04:46:41 2006
+++ pspp/src/language/data-io/data-list.c Mon Apr 24 05:10:00 2006
@@ -98,6 +98,7 @@
static const struct case_source_class data_list_source_class;
+static void rpd_msg (enum msg_class, const char *format, ...);
static int parse_fixed (struct data_list_pgm *);
static int parse_free (struct dls_var_spec **, struct dls_var_spec **);
static void dump_fixed_table (const struct dls_var_spec *,
@@ -108,9 +109,6 @@
static trns_free_func data_list_trns_free;
static trns_proc_func data_list_trns_proc;
-/* Message title for REPEATING DATA. */
-#define RPD_ERR "REPEATING DATA: "
-
int
cmd_data_list (void)
{
@@ -1814,9 +1812,10 @@
data_out (actual_str, &t->id_var->print, id_temp);
actual_str[t->id_var->print.w] = '\0';
- tmsg (SE, RPD_ERR,
- _("Encountered mismatched record ID \"%s\" expecting \"%s\"."),
- actual_str, expected_str);
+ rpd_msg (SE,
+ _("Encountered mismatched record ID \"%s\" "
+ "expecting \"%s\"."),
+ actual_str, expected_str);
return 0;
}
@@ -1846,10 +1845,10 @@
{
warned = 1;
- tmsg (SW, RPD_ERR,
- _("Variable %s starting in column %d extends "
- "beyond physical record length of %d."),
- var_spec->v->name, fc, info->len);
+ rpd_msg (SW,
+ _("Variable %s starting in column %d extends "
+ "beyond physical record length of %d."),
+ var_spec->v->name, fc, info->len);
}
{
@@ -1914,46 +1913,45 @@
occurs_left = occurs = realize_value (&t->occurs, c);
if (occurs <= 0)
{
- tmsg (SE, RPD_ERR, _("Invalid value %d for OCCURS."), occurs);
+ rpd_msg (SE, _("Invalid value %d for OCCURS."), occurs);
return TRNS_NEXT_CASE;
}
starts_beg = realize_value (&t->starts_beg, c);
if (starts_beg <= 0)
{
- tmsg (SE, RPD_ERR, _("Beginning column for STARTS (%d) must be "
- "at least 1."),
- starts_beg);
+ rpd_msg (SE, _("Beginning column for STARTS (%d) must be at least 1."),
+ starts_beg);
return TRNS_NEXT_CASE;
}
starts_end = realize_value (&t->starts_end, c);
if (starts_end < starts_beg)
{
- tmsg (SE, RPD_ERR, _("Ending column for STARTS (%d) is less than "
- "beginning column (%d)."),
- starts_end, starts_beg);
+ rpd_msg (SE, _("Ending column for STARTS (%d) is less than "
+ "beginning column (%d)."),
+ starts_end, starts_beg);
skip_first_record = 1;
}
length = realize_value (&t->length, c);
if (length < 0)
{
- tmsg (SE, RPD_ERR, _("Invalid value %d for LENGTH."), length);
+ rpd_msg (SE, _("Invalid value %d for LENGTH."), length);
length = 1;
occurs = occurs_left = 1;
}
cont_beg = realize_value (&t->cont_beg, c);
if (cont_beg < 0)
{
- tmsg (SE, RPD_ERR, _("Beginning column for CONTINUED (%d) must be "
- "at least 1."),
- cont_beg);
+ rpd_msg (SE, _("Beginning column for CONTINUED (%d) must be "
+ "at least 1."),
+ cont_beg);
return TRNS_DROP_CASE;
}
cont_end = realize_value (&t->cont_end, c);
if (cont_end < cont_beg)
{
- tmsg (SE, RPD_ERR, _("Ending column for CONTINUED (%d) is less than "
- "beginning column (%d)."),
- cont_end, cont_beg);
+ rpd_msg (SE, _("Ending column for CONTINUED (%d) is less than "
+ "beginning column (%d)."),
+ cont_end, cont_beg);
return TRNS_DROP_CASE;
}
@@ -1982,11 +1980,11 @@
continuation records. */
if (occurs_left > 0 && cont_beg == 0)
{
- tmsg (SE, RPD_ERR,
- _("Number of repetitions specified on OCCURS (%d) "
- "exceed number of repetitions available in "
- "space on STARTS (%d), and CONTINUED not specified."),
- occurs, (starts_end - starts_beg + 1) / length);
+ rpd_msg (SE,
+ _("Number of repetitions specified on OCCURS (%d) "
+ "exceed number of repetitions available in "
+ "space on STARTS (%d), and CONTINUED not specified."),
+ occurs, (starts_end - starts_beg + 1) / length);
return TRNS_DROP_CASE;
}
@@ -2000,10 +1998,10 @@
/* Read in another record. */
if (dfm_eof (t->reader))
{
- tmsg (SE, RPD_ERR,
- _("Unexpected end of file with %d repetitions "
- "remaining out of %d."),
- occurs_left, occurs);
+ rpd_msg (SE,
+ _("Unexpected end of file with %d repetitions "
+ "remaining out of %d."),
+ occurs_left, occurs);
return TRNS_DROP_CASE;
}
dfm_expand_tabs (t->reader);
@@ -2060,3 +2058,27 @@
t->write_case = write_case;
t->wc_data = wc_data;
}
+
+/* Reports a message in CLASS with the given FORMAT as text,
+ prefixing the message with "REPEATING DATA: " to make the
+ cause clear. */
+static void
+rpd_msg (enum msg_class class, const char *format, ...)
+{
+ struct error e;
+ va_list args;
+ struct string text;
+
+ ds_create (&text, "REPEATING DATA: ");
+ va_start (args, format);
+ ds_vprintf (&text, format, args);
+ va_end (args);
+
+ e.category = msg_class_to_category (class);
+ e.severity = msg_class_to_severity (class);
+ e.where.file_name = NULL;
+ e.where.line_number = 0;
+ e.text = ds_c_str (&text);
+
+ err_msg (&e);
+}
Index: pspp/src/language/expressions/ChangeLog
diff -u pspp/src/language/expressions/ChangeLog:1.1
pspp/src/language/expressions/ChangeLog:1.2
--- pspp/src/language/expressions/ChangeLog:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/ChangeLog Mon Apr 24 05:10:00 2006
@@ -1,3 +1,12 @@
+Sun Apr 23 22:06:45 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * helpers.c: (expr_error) Use err_msg() instead of err_vmsg().
+ Format message ourselves.
+
Thu Mar 2 08:40:33 WST 2006 John Darrington <address@hidden>
* Moved files from src directory
Index: pspp/src/language/expressions/helpers.c
diff -u pspp/src/language/expressions/helpers.c:1.3
pspp/src/language/expressions/helpers.c:1.4
--- pspp/src/language/expressions/helpers.c:1.3 Mon Apr 17 03:49:48 2006
+++ pspp/src/language/expressions/helpers.c Mon Apr 24 05:10:00 2006
@@ -18,11 +18,11 @@
e.category = MSG_SYNTAX;
e.severity = MSG_ERROR;
err_location (&e.where);
- e.title = NULL;
-
va_start (args, format);
- err_vmsg (&e, format, args);
+ e.text = xvasprintf (format, args);
va_end (args);
+
+ err_msg (&e);
}
double
Index: pspp/src/libpspp/ChangeLog
diff -u pspp/src/libpspp/ChangeLog:1.12 pspp/src/libpspp/ChangeLog:1.13
--- pspp/src/libpspp/ChangeLog:1.12 Mon Apr 17 03:49:48 2006
+++ pspp/src/libpspp/ChangeLog Mon Apr 24 05:10:00 2006
@@ -1,3 +1,12 @@
+Sun Apr 23 22:07:06 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * message.h: (struct error) Remove `title' member. Add `text'
+ member.
+
Sun Apr 16 20:43:35 2006 Ben Pfaff <address@hidden>
Continue reforming error message support. In this phase, we
Index: pspp/src/libpspp/message.h
diff -u pspp/src/libpspp/message.h:1.6 pspp/src/libpspp/message.h:1.7
--- pspp/src/libpspp/message.h:1.6 Mon Apr 17 03:49:48 2006
+++ pspp/src/libpspp/message.h Mon Apr 24 05:10:00 2006
@@ -81,7 +81,7 @@
enum msg_category category; /* Message category. */
enum msg_severity severity; /* Message severity. */
struct file_locator where; /* File location, or (NULL, -1). */
- const char *title; /* Special text inserted if not null. */
+ char *text; /* Error text. */
};
/* Number of errors, warnings reported. */
@@ -96,11 +96,10 @@
/* Nonnegative verbosity level. Higher value == more verbose. */
extern int err_verbosity;
-/* Functions. */
+/* Emitting messages. */
void msg (enum msg_class, const char *format, ...)
PRINTF_FORMAT (2, 3);
-void tmsg (enum msg_class, const char *title, const char *format, ...)
- PRINTF_FORMAT (3, 4);
+void err_msg (const struct error *);
void verbose_msg (int level, const char *format, ...)
PRINTF_FORMAT (2, 3);
@@ -114,7 +113,6 @@
void err_set_command_name (const char *);
void err_done (void);
void err_check_count (void);
-void err_vmsg (const struct error *, const char *, va_list);
/* Used in panic situations only */
void request_bug_report_and_abort(const char *msg );
Index: pspp/src/message.c
diff -u pspp/src/message.c:1.9 pspp/src/message.c:1.10
--- pspp/src/message.c:1.9 Mon Apr 24 03:45:41 2006
+++ pspp/src/message.c Mon Apr 24 05:10:00 2006
@@ -48,24 +48,6 @@
/* Public functions. */
-/* Writes error message in CLASS, with title TITLE and text FORMAT,
- formatted with printf, to the standard places. */
-void
-tmsg (enum msg_class class, const char *title, const char *format, ...)
-{
- struct error e;
- va_list args;
-
- e.category = msg_class_to_category (class);
- e.severity = msg_class_to_severity (class);
- err_location (&e.where);
- e.title = title;
-
- va_start (args, format);
- err_vmsg (&e, format, args);
- va_end (args);
-}
-
/* Writes error message in CLASS, with text FORMAT, formatted with
printf, to the standard places. */
void
@@ -77,11 +59,11 @@
e.category = msg_class_to_category (class);
e.severity = msg_class_to_severity (class);
err_location (&e.where);
- e.title = NULL;
-
va_start (args, format);
- err_vmsg (&e, format, args);
+ e.text = xvasprintf (format, args);
va_end (args);
+
+ err_msg (&e);
}
/* Writes MESSAGE formatted with printf, to stderr, if the
@@ -143,8 +125,10 @@
readln_uninitialize();
}
+/* Emits E as an error message.
+ Frees `text' member in E. */
void
-err_vmsg (const struct error *e, const char *format, va_list args)
+err_msg (const struct error *e)
{
struct category
{
@@ -193,16 +177,14 @@
if (category->show_command_name && command_name != NULL)
ds_printf (&msg, "%s: ", command_name);
- if (e->title)
- ds_puts (&msg, e->title);
-
- ds_vprintf (&msg, format, args);
+ ds_puts (&msg, e->text);
/* FIXME: Check set_messages and set_errors to determine where to
send errors and messages. */
dump_message (ds_c_str (&msg), puts_stdout, get_viewwidth (), 8);
ds_destroy (&msg);
+ free (e->text);
}
/* Private functions. */
Index: pspp/src/ui/gui/ChangeLog
diff -u pspp/src/ui/gui/ChangeLog:1.5 pspp/src/ui/gui/ChangeLog:1.6
--- pspp/src/ui/gui/ChangeLog:1.5 Mon Apr 17 03:49:48 2006
+++ pspp/src/ui/gui/ChangeLog Mon Apr 24 05:10:00 2006
@@ -1,3 +1,12 @@
+Sun Apr 23 22:07:49 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming error message support. In this phase, get rid
+ of message "titles" and put the message text in `struct error'.
+ Now `struct error' encapsulates a message more properly.
+
+ * message-dialog.c: (err_vmsg) Rename err_msg(). Updated
+ interface.
+
Sun Apr 16 20:45:35 2006 Ben Pfaff <address@hidden>
Continue reforming error message support. In this phase, we
Index: pspp/src/ui/gui/message-dialog.c
diff -u pspp/src/ui/gui/message-dialog.c:1.7
pspp/src/ui/gui/message-dialog.c:1.8
--- pspp/src/ui/gui/message-dialog.c:1.7 Mon Apr 17 03:49:48 2006
+++ pspp/src/ui/gui/message-dialog.c Mon Apr 24 05:10:00 2006
@@ -113,10 +113,10 @@
void
-err_vmsg (const struct error *e, const char *format, va_list args)
+err_msg (const struct error *e)
{
vmsg(msg_class_from_category_and_severity (e->category, e->severity),
- format, args);
+ "%s", e->text);
}