projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue reforming error message support. In this phase, rename
[pspp-builds.git]
/
src
/
ui
/
gui
/
message-dialog.c
diff --git
a/src/ui/gui/message-dialog.c
b/src/ui/gui/message-dialog.c
index 693db49f70f2a9ddd1dcfd281b8d6a8820a0f5bd..f1a18baf5bf5caf7080f7f2cb6e4607d0c34c5ff 100644
(file)
--- a/
src/ui/gui/message-dialog.c
+++ b/
src/ui/gui/message-dialog.c
@@
-50,41
+50,31
@@
vmsg(int klass, const char *fmt, va_list args)
gint message_type;
gint message_type;
- switch (
klass
)
+ switch (
msg_class_to_severity (klass)
)
{
{
- case SE:
- case DE:
- case ME:
+ case MSG_ERROR:
message_type = GTK_MESSAGE_ERROR;
break;
message_type = GTK_MESSAGE_ERROR;
break;
- case SW:
- case DW:
- case MW:
+ case MSG_WARNING:
message_type = GTK_MESSAGE_WARNING;
break;
message_type = GTK_MESSAGE_WARNING;
break;
- case SM:
- case MM:
+ case MSG_NOTE:
default:
message_type = GTK_MESSAGE_INFO;
break;
};
default:
message_type = GTK_MESSAGE_INFO;
break;
};
- switch (
klass
)
+ switch (
msg_class_to_category (klass)
)
{
{
- case SE:
- case SW:
- case SM:
+ case MSG_SYNTAX:
msg = g_strdup(_("Script Error"));
break;
msg = g_strdup(_("Script Error"));
break;
- case DE:
- case DW:
+ case MSG_DATA:
msg = g_strdup(_("Data File Error"));
break;
msg = g_strdup(_("Data File Error"));
break;
- case ME:
- case MW:
- case MM:
+ case MSG_GENERAL:
default:
msg = g_strdup(_("PSPP Error"));
break;
default:
msg = g_strdup(_("PSPP Error"));
break;
@@
-113,7
+103,7
@@
vmsg(int klass, const char *fmt, va_list args)
void
void
-msg(
int
klass, const char *fmt, ...)
+msg(
enum msg_class
klass, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
{
va_list ap;
va_start(ap, fmt);
@@
-123,14
+113,15
@@
msg(int klass, const char *fmt, ...)
void
void
-
err_vmsg (const struct error *e, const char *format, va_list args
)
+
msg_emit (const struct msg *m
)
{
{
- vmsg(e->class, format, args);
+ vmsg (msg_class_from_category_and_severity (m->category, m->severity),
+ "%s", m->text);
}
void
}
void
-
err
_assert_fail(const char *expr, const char *file, int line)
+
msg
_assert_fail(const char *expr, const char *file, int line)
{
msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
}
{
msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
}
@@
-147,9
+138,9
@@
verbose_msg (int level, const char *format, ...)
* A temporary workaround until getl.c is rearranged
*/
void
* A temporary workaround until getl.c is rearranged
*/
void
-
err_location (struct file_locator *f
)
+
msg_location (struct msg_locator *loc
)
{
{
-
f
->file_name = 0;
-
f
->line_number = -1;
+
loc
->file_name = 0;
+
loc
->line_number = -1;
}
}