X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fsyntax-string-source.c;h=405141cd50a7fd1734f387281b5b344d5a7e74f9;hb=6ccced652fb274a08361fb844fb1c435a4c654d1;hp=4fe70ff2ad171f083f3fc5f6d5d4c4f8643c0dec;hpb=d8749acaf878dccf9e4527c27d06d06eb5e03091;p=pspp-builds.git
diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index 4fe70ff2..405141cd 100644
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -1,27 +1,24 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical interface for PSPP.
+ Copyright (C) 2007, 2009 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
+#include
#include
-#include
#include
#include
@@ -29,6 +26,8 @@
#include "syntax-string-source.h"
+#include "xalloc.h"
+
struct syntax_string_source
{
struct getl_interface parent;
@@ -60,9 +59,10 @@ location (const struct getl_interface *i UNUSED)
static void
-close (struct getl_interface *i )
+do_close (struct getl_interface *i )
{
- struct syntax_string_source *sss = (struct syntax_string_source *) i;
+ struct syntax_string_source *sss = UP_CAST (i, struct syntax_string_source,
+ parent);
ds_destroy (&sss->buffer);
@@ -73,10 +73,10 @@ close (struct getl_interface *i )
static bool
read_single_line (struct getl_interface *i,
- struct string *line,
- enum getl_syntax *syntax_rules UNUSED)
+ struct string *line)
{
- struct syntax_string_source *sss = (struct syntax_string_source *) i;
+ struct syntax_string_source *sss = UP_CAST (i, struct syntax_string_source,
+ parent);
size_t next;
@@ -116,14 +116,14 @@ create_syntax_string_source (const char *format, ...)
va_end (args);
sss->parent.interactive = always_false;
- sss->parent.close = close;
+ sss->parent.close = do_close;
sss->parent.read = read_single_line;
sss->parent.name = name;
sss->parent.location = location;
- return (struct getl_interface *) sss;
+ return &sss->parent;
}
/* Return the syntax currently contained in S.