X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmessage.c;h=e6a8f76b11f346e96355053d8a0dc6b9bfea8e4d;hb=3f2ed1c5fe6dc692ca00bb18a15e41617fa2d37d;hp=dbd3c638912918d8115cfdc1b171d2bb5f2f1397;hpb=a7a18bd636d11d167c1ebe54c9893a0c23d44bc9;p=pspp-builds.git diff --git a/src/message.c b/src/message.c index dbd3c638..e6a8f76b 100644 --- a/src/message.c +++ b/src/message.c @@ -145,7 +145,7 @@ err_vmsg (const struct error *e, const char *format, va_list args) enum { ERR_IN_PROCEDURE = 01, /* 1=Display name of current procedure. */ - ERR_WITH_FILE = 02, /* 1=Display filename and line number. */ + ERR_WITH_FILE = 02, /* 1=Display file name and line number. */ }; /* Describes one class of error. */ @@ -176,9 +176,9 @@ err_vmsg (const struct error *e, const char *format, va_list args) assert (format != NULL); ds_init (&msg, 64); - if (e->where.filename && (error_classes[e->class].flags & ERR_WITH_FILE)) + if (e->where.file_name && (error_classes[e->class].flags & ERR_WITH_FILE)) { - ds_printf (&msg, "%s:", e->where.filename); + ds_printf (&msg, "%s:", e->where.file_name); if (e->where.line_number != -1) ds_printf (&msg, "%d:", e->where.line_number); ds_putc (&msg, ' ');