projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use macros from cast.h instead of literal casts
[pspp]
/
src
/
language
/
syntax-file.c
diff --git
a/src/language/syntax-file.c
b/src/language/syntax-file.c
index 678d2f51fa96b9217f6b172d190d7abf4dfbc01f..83bd07b351b9cb2ee9f270ce3eed1534b6ad5982 100644
(file)
--- a/
src/language/syntax-file.c
+++ b/
src/language/syntax-file.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,12
+29,12
@@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
+#include <libpspp/cast.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
#include <libpspp/version.h>
#include <libpspp/version.h>
-#include <output/tab
le
.h>
+#include <output/tab.h>
#include <libpspp/ll.h>
#include <libpspp/ll.h>
@@
-62,14
+62,16
@@
struct syntax_file_source
static const char *
name (const struct getl_interface *s)
{
static const char *
name (const struct getl_interface *s)
{
- const struct syntax_file_source *sfs = (const struct syntax_file_source *) s;
+ const struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+ parent);
return sfs->fn;
}
static int
line_number (const struct getl_interface *s)
{
return sfs->fn;
}
static int
line_number (const struct getl_interface *s)
{
- const struct syntax_file_source *sfs = (const struct syntax_file_source *) s;
+ const struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+ parent);
return sfs->ln;
}
return sfs->ln;
}
@@
-80,26
+82,18
@@
static bool
read_syntax_file (struct getl_interface *s,
struct string *line)
{
read_syntax_file (struct getl_interface *s,
struct string *line)
{
- struct syntax_file_source *sfs = (struct syntax_file_source *) s;
+ 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)
- {
- verbose_msg (1, _("opening \"%s\" as syntax file"), sfs->fn);
- 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. */
do
{
sfs->ln++;
/* Read line from file and remove new-line.
Skip initial "#! /usr/bin/pspp" line. */
do
{
sfs->ln++;
+ ds_clear (line);
if (!ds_read_line (line, sfs->syntax_file, SIZE_MAX))
{
if (ferror (sfs->syntax_file))
if (!ds_read_line (line, sfs->syntax_file, SIZE_MAX))
{
if (ferror (sfs->syntax_file))
@@
-110,17
+104,14
@@
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;
}
static void
syntax_close (struct getl_interface *s)
{
return true;
}
static void
syntax_close (struct getl_interface *s)
{
- struct syntax_file_source *sfs = (struct syntax_file_source *) s;
+ struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+ parent);
if (sfs->syntax_file && EOF == fn_close (sfs->fn, sfs->syntax_file))
msg (MW, _("Closing `%s': %s."), sfs->fn, strerror (errno));
if (sfs->syntax_file && EOF == fn_close (sfs->fn, sfs->syntax_file))
msg (MW, _("Closing `%s': %s."), sfs->fn, strerror (errno));
@@
-142,6
+133,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 ;
@@
-150,6
+144,6
@@
create_syntax_file_source (const char *fn)
ss->parent.name = name ;
ss->parent.location = line_number;
ss->parent.name = name ;
ss->parent.location = line_number;
- return
(struct getl_interface *) ss
;
+ return
&ss->parent
;
}
}