projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e37a4f
)
pspp: Get rid of clean_up() function now that it has only one caller.
author
Ben Pfaff
<blp@cs.stanford.edu>
Mon, 11 Oct 2010 04:15:19 +0000
(21:15 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Mon, 11 Oct 2010 04:15:19 +0000
(21:15 -0700)
src/ui/terminal/main.c
patch
|
blob
|
history
diff --git
a/src/ui/terminal/main.c
b/src/ui/terminal/main.c
index 478c2fd515c6c1f9c2f6901460cb0e05d751ab2a..64a7d2ec013e97a732b782570c25869b85fa669b 100644
(file)
--- a/
src/ui/terminal/main.c
+++ b/
src/ui/terminal/main.c
@@
-72,7
+72,6
@@
static void add_syntax_file (struct source_stream *, enum syntax_mode,
const char *file_name);
static void bug_handler(int sig);
static void fpu_init (void);
const char *file_name);
static void bug_handler(int sig);
static void fpu_init (void);
-static void clean_up (void);
/* Program entry point. */
int
/* Program entry point. */
int
@@
-153,7
+152,19
@@
main (int argc, char **argv)
}
}
- clean_up ();
+ destroy_dataset (the_dataset);
+
+ random_done ();
+ settings_done ();
+ fh_done ();
+ lex_destroy (the_lexer);
+ destroy_source_stream (the_source_stream);
+ prompt_done ();
+ readln_uninitialize ();
+ output_close ();
+ msg_ui_done ();
+ i18n_done ();
+
return msg_ui_any_errors ();
}
return msg_ui_any_errors ();
}
@@
-201,30
+212,6
@@
bug_handler(int sig)
raise (sig);
}
raise (sig);
}
-/* Clean up PSPP in preparation for termination. */
-static void
-clean_up (void)
-{
- static bool terminating = false;
- if (!terminating)
- {
- terminating = true;
-
- destroy_dataset (the_dataset);
-
- random_done ();
- settings_done ();
- fh_done ();
- lex_destroy (the_lexer);
- destroy_source_stream (the_source_stream);
- prompt_done ();
- readln_uninitialize ();
- output_close ();
- msg_ui_done ();
- i18n_done ();
- }
-}
-
static void
add_syntax_file (struct source_stream *ss, enum syntax_mode syntax_mode,
const char *file_name)
static void
add_syntax_file (struct source_stream *ss, enum syntax_mode syntax_mode,
const char *file_name)