projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove various duplicated #include directives
[pspp-builds.git]
/
src
/
language
/
syntax-file.c
diff --git
a/src/language/syntax-file.c
b/src/language/syntax-file.c
index ad277b5859dec12b1125a4a6b0ac40329a6d2a50..97f73fd6fca44f344a163be35038d7d77aa55754 100644
(file)
--- a/
src/language/syntax-file.c
+++ b/
src/language/syntax-file.c
@@
-31,7
+31,6
@@
#include <libpspp/assertion.h>
#include <libpspp/cast.h>
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include <libpspp/cast.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
@@
-85,17
+84,8
@@
read_syntax_file (struct getl_interface *s,
struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
parent);
struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
parent);
- /* Open file, if not yet opened. */
if (sfs->syntax_file == NULL)
if (sfs->syntax_file == NULL)
- {
- sfs->syntax_file = fn_open (sfs->fn, "r");
-
- if (sfs->syntax_file == NULL)
- {
- msg (ME, _("Opening `%s': %s."), sfs->fn, strerror (errno));
- return false;
- }
- }
+ return false;
/* Read line from file and remove new-line.
Skip initial "#! /usr/bin/pspp" line. */
/* Read line from file and remove new-line.
Skip initial "#! /usr/bin/pspp" line. */
@@
-113,10
+103,6
@@
read_syntax_file (struct getl_interface *s,
}
while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
}
while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
- /* Echo to listing file, if configured to do so. */
- if (settings_get_echo ())
- tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
-
return true;
}
return true;
}
@@
-146,6
+132,9
@@
create_syntax_file_source (const char *fn)
struct syntax_file_source *ss = xzalloc (sizeof (*ss));
ss->fn = xstrdup (fn);
struct syntax_file_source *ss = xzalloc (sizeof (*ss));
ss->fn = xstrdup (fn);
+ ss->syntax_file = fn_open (ss->fn, "r");
+ if (ss->syntax_file == NULL)
+ msg (ME, _("Opening `%s': %s."), ss->fn, strerror (errno));
ss->parent.interactive = always_false;
ss->parent.read = read_syntax_file ;
ss->parent.interactive = always_false;
ss->parent.read = read_syntax_file ;