X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=8ed050778fdcec6e870e0d243ccd6b39e7859d9c;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=b95ae2e3a2662675ec299c27d8f8f98dd6cbc6a5;hpb=732b6a86124e89e24d685ed785d2df55728eb01b;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index b95ae2e3a2..8ed050778f 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -27,7 +27,6 @@ #include "progname.h" #include "read-line.h" -#include #include #include #include @@ -86,7 +85,6 @@ static struct source_stream *the_source_stream ; int main (int argc, char **argv) { - struct casefile_factory *factory; signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); @@ -111,9 +109,7 @@ main (int argc, char **argv) settings_init (); random_init (); - factory = fastfile_factory_create (); - - the_dataset = create_dataset (factory, NULL, NULL); + the_dataset = create_dataset (NULL, NULL); if (parse_command_line (argc, argv, the_source_stream)) { @@ -132,7 +128,7 @@ main (int argc, char **argv) { msg (SE, _("Stopping syntax file processing here to avoid " "a cascade of dependent command failures.")); - getl_abort_noninteractive (the_source_stream); + getl_abort_noninteractive (the_source_stream); } else check_msg_count (the_source_stream); @@ -143,7 +139,7 @@ main (int argc, char **argv) } static void -i18n_init (void) +i18n_init (void) { #if ENABLE_NLS #if HAVE_LC_MESSAGES @@ -156,7 +152,7 @@ i18n_init (void) } static void -fpu_init (void) +fpu_init (void) { #if HAVE_FEHOLDEXCEPT fenv_t foo; @@ -169,13 +165,13 @@ fpu_init (void) } /* If a segfault happens, issue a message to that effect and halt */ -void +void bug_handler(int sig) { #if DEBUGGING connect_debugger (); #endif - switch (sig) + switch (sig) { case SIGABRT: request_bug_report_and_abort("Assertion Failure/Abort"); @@ -188,7 +184,7 @@ bug_handler(int sig) } } -void +void interrupt_handler(int sig UNUSED) { terminate (false); @@ -201,7 +197,7 @@ static void terminate (bool success) { static bool terminating = false; - if (!terminating) + if (!terminating) { terminating = true;