X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ferror.c;h=28da450ed86bc7cb0f80e05beb5a3d78688f3de4;hb=25f3bb47d1dab6a32c0ba30db8583413dd17d93b;hp=3c91f73266ef4848f5a66931322e32ce43e9b2d0;hpb=2e02472cf15ddb64c33a1477cf4cfbf3be2d0c95;p=pspp diff --git a/src/error.c b/src/error.c index 3c91f73266..28da450ed8 100644 --- a/src/error.c +++ b/src/error.c @@ -25,7 +25,7 @@ #include #include "alloc.h" #include "command.h" -#include "getline.h" +#include "getl.h" #include "glob.h" #include "lexer.h" #include "main.h" @@ -35,6 +35,10 @@ #include "var.h" #include "version.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + int err_error_count; int err_warning_count; @@ -122,7 +126,7 @@ err_push_file_locator (const struct file_locator *f) else mfile_loc *= 2; - file_loc = xrealloc (file_loc, mfile_loc * sizeof *file_loc); + file_loc = xnrealloc (file_loc, mfile_loc, sizeof *file_loc); } file_loc[nfile_loc++] = f; @@ -204,11 +208,11 @@ err_hcf (int success) free(file_loc); file_loc = NULL; + nfile_loc = mfile_loc = 0; outp_done (); done_glob(); - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }