projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a (currently unpopulated) box for the paired samples correlations
[pspp-builds.git]
/
src
/
error.c
diff --git
a/src/error.c
b/src/error.c
index 1983df4d056b92ec412f9a6c25f11948dfb1b9a0..9896fb279cba29d08c2fe1d4d672894ba5eb9eb1 100644
(file)
--- a/
src/error.c
+++ b/
src/error.c
@@
-17,32
+17,15
@@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/* AIX requires this to be the first thing in the file. */
#include <config.h>
#include <config.h>
-#if __GNUC__
-#define alloca __builtin_alloca
-#else
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
-#pragma alloca
-#else
-#ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#endif
-#endif
-#endif
-#endif
-
#include <assert.h>
#include <assert.h>
+#include "error.h"
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
-#include "error.h"
#include "getline.h"
#include "main.h"
#include "output.h"
#include "getline.h"
#include "main.h"
#include "output.h"
@@
-217,10
+200,6
@@
err_check_count (void)
getl_close_all ();
}
getl_close_all ();
}
-#if __CHECKER__
-static void induce_segfault (void);
-#endif
-
/* Some machines are broken. Compensate. */
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
/* Some machines are broken. Compensate. */
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
@@
-244,11
+223,6
@@
err_hcf (int success)
outp_done ();
outp_done ();
-#if __CHECKER__
- if (!success)
- induce_segfault ();
-#endif
-
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
@@
-285,11
+259,11
@@
err_vmsg (const struct error *e)
{0, NULL, N_("installation error")}, /* IE */
{2, NULL, N_("installation error")}, /* IS */
{0, NULL, N_("installation error")}, /* IE */
{2, NULL, N_("installation error")}, /* IS */
- {2,
NULL, N_("error")},
/* DE */
- {2,
NULL, N_("warning")},
/* DW */
+ {2,
&err_error_count, N_("error")},
/* DE */
+ {2,
&err_warning_count, N_("warning")},
/* DW */
- {0,
NULL, N_("error")},
/* ME */
- {0,
NULL, N_("warning")},
/* MW */
+ {0,
&err_error_count, N_("error")},
/* ME */
+ {0,
&err_warning_count, N_("warning")},
/* MW */
{0, NULL, N_("note")}, /* MM */
};
{0, NULL, N_("note")}, /* MM */
};
@@
-499,19
+473,3
@@
dump_message (char *msg, unsigned indent, void (*func) (const char *),
local_free (buf);
}
local_free (buf);
}
-
-#if __CHECKER__
-/* Causes a segfault in order to force Checker to print a stack
- backtrace. */
-static void
-induce_segfault (void)
-{
- fputs (_("\n"
- "\t*********************\n"
- "\t* INDUCING SEGFAULT *\n"
- "\t*********************\n"), stdout);
- fflush (stdout);
- fflush (stderr);
- abort ();
-}
-#endif