i18n: New function recode_substring_pool().

[pspp] / src / language / syntax-string-source.c

diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index bcdcbd3767c5b671df04bf1ac2d46477f3d880e2..405141cd50a7fd1734f387281b5b344d5a7e74f9 100644 (file)
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical interface for PSPP.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   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
@@ -17,8 +17,8 @@
 
 #include <config.h>
 
+#include <libpspp/cast.h>
 #include <libpspp/getl.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/str.h>
 
@@ -26,6 +26,8 @@
 
 #include "syntax-string-source.h"
 
+#include "xalloc.h"
+
 struct syntax_string_source
   {
     struct getl_interface parent;
@@ -59,7 +61,8 @@ location (const struct getl_interface *i UNUSED)
 static void
 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);
 
@@ -70,10 +73,10 @@ do_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;
 
@@ -120,7 +123,7 @@ create_syntax_string_source (const char *format, ...)
   sss->parent.location = location;
 
 
-  return (struct getl_interface *) sss;
+  return &sss->parent;
 }
 
 /* Return the syntax currently contained in S.