projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parameter estimate matched with appropriate variable during estimation
[pspp]
/
src
/
error.c
diff --git
a/src/error.c
b/src/error.c
index 142b2c9f6590fc3dc0b71a0c583b2e517931485e..28da450ed86bc7cb0f80e05beb5a3d78688f3de4 100644
(file)
--- a/
src/error.c
+++ b/
src/error.c
@@
-25,7
+25,7
@@
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "glob.h"
#include "lexer.h"
#include "main.h"
#include "glob.h"
#include "lexer.h"
#include "main.h"
@@
-35,6
+35,10
@@
#include "var.h"
#include "version.h"
#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;
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;
else
mfile_loc *= 2;
- file_loc = x
realloc (file_loc, mfile_loc *
sizeof *file_loc);
+ file_loc = x
nrealloc (file_loc, mfile_loc,
sizeof *file_loc);
}
file_loc[nfile_loc++] = f;
}
file_loc[nfile_loc++] = f;
@@
-203,10
+207,12
@@
err_hcf (int success)
getl_uninitialize ();
free(file_loc);
getl_uninitialize ();
free(file_loc);
+ file_loc = NULL;
+ nfile_loc = mfile_loc = 0;
+
outp_done ();
done_glob();
outp_done ();
done_glob();
-
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
@@
-510,7
+516,9
@@
request_bug_report_and_abort(const char *msg )
"default_config_path: %s\n"
"include_path: %s\n"
"groff_font_path: %s\n"
"default_config_path: %s\n"
"include_path: %s\n"
"groff_font_path: %s\n"
- "locale_dir: %s\n",
+ "locale_dir: %s\n"
+ "compiler version: %s\n"
+ ,
bare_version,
version,
bare_version,
version,
@@
-520,7
+528,13
@@
request_bug_report_and_abort(const char *msg )
default_config_path,
include_path,
groff_font_path,
default_config_path,
include_path,
groff_font_path,
- locale_dir);
+ locale_dir,
+#ifdef __VERSION__
+ __VERSION__
+#else
+ "Unknown"
+#endif
+ );
if ( msg )
fprintf(stderr,"Diagnosis: %s\n",msg);
if ( msg )
fprintf(stderr,"Diagnosis: %s\n",msg);