Fix warnings.

diff --git a/Smake b/Smake
index 21583c6d764c2591355aed8d919d7c589f5f905b..14c19db98d67fca10a3d39e3539ad4368ed0b600 100644 (file)
--- a/Smake
+++ b/Smake
@@ -17,6 +17,7 @@ GNULIB_MODULES = \
        fpieee \
        full-read \
        full-write \
+        fseeko \
        fwriteerror \
        gethostname \
        getline \

diff --git a/po/de.po b/po/de.po
index b25311f1b0ac2c0f08e620643c1254c718aa55d8..15363df4ebd3f260baf0dfd4b8027c9dc6639ddb 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2007-04-25 07:29+0800\n"
+"POT-Creation-Date: 2007-04-28 11:18+0800\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
@@ -3415,6 +3415,24 @@ msgstr ""
 msgid "Closing `%s': %s."
 msgstr ""
 
+#: src/language/tests/check-model.q:139
+msgid "PATH and SEARCH subcommands are mutually exclusive.  Ignoring PATH."
+msgstr ""
+
+#: src/language/tests/check-model.q:157
+msgid "At least one value must be specified on PATH."
+msgstr ""
+
+#: src/language/tests/check-model.q:168
+#, c-format
+msgid "Hash bits adjusted to %d."
+msgstr ""
+
+#: src/language/tests/check-model.q:209
+#, c-format
+msgid "error opening \"%s\" for writing"
+msgstr ""
+
 #: src/language/tests/float-format.c:126
 #, c-format
 msgid "%d-byte string needed but %d-byte string supplied."
@@ -4692,14 +4710,14 @@ msgstr "Variableansicht"
 msgid "Current Status: "
 msgstr ""
 
-#: src/ui/gui/psppire.glade:281
+#: src/ui/gui/psppire.glade:259
 #, fuzzy
-msgid "Variable(s):"
+msgid "Name Variable:"
 msgstr "Variableansicht"
 
-#: src/ui/gui/psppire.glade:330
+#: src/ui/gui/psppire.glade:292
 #, fuzzy
-msgid "Name Variable:"
+msgid "Variable(s):"
 msgstr "Variableansicht"
 
 #: src/ui/gui/psppire.glade:446

diff --git a/po/pspp.pot b/po/pspp.pot
index b9876c259bd53e6b4bc2fb6008e4c7165e3f02f1..d404c4489f87eeff5ca826c3cb5f552b5d25a232 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2007-04-25 07:29+0800\n"
+"POT-Creation-Date: 2007-04-28 11:18+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3409,6 +3409,24 @@ msgstr ""
 msgid "Closing `%s': %s."
 msgstr ""
 
+#: src/language/tests/check-model.q:139
+msgid "PATH and SEARCH subcommands are mutually exclusive.  Ignoring PATH."
+msgstr ""
+
+#: src/language/tests/check-model.q:157
+msgid "At least one value must be specified on PATH."
+msgstr ""
+
+#: src/language/tests/check-model.q:168
+#, c-format
+msgid "Hash bits adjusted to %d."
+msgstr ""
+
+#: src/language/tests/check-model.q:209
+#, c-format
+msgid "error opening \"%s\" for writing"
+msgstr ""
+
 #: src/language/tests/float-format.c:126
 #, c-format
 msgid "%d-byte string needed but %d-byte string supplied."
@@ -4664,12 +4682,12 @@ msgstr ""
 msgid "Current Status: "
 msgstr ""
 
-#: src/ui/gui/psppire.glade:281
-msgid "Variable(s):"
+#: src/ui/gui/psppire.glade:259
+msgid "Name Variable:"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:330
-msgid "Name Variable:"
+#: src/ui/gui/psppire.glade:292
+msgid "Variable(s):"
 msgstr ""
 
 #: src/ui/gui/psppire.glade:446

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index e77abfe5b810fc2efff3d4cb35ba98c7776876e6..43056c8b7431b7e7f22da99c11d459380b411880 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -97,7 +97,7 @@ recode_string (enum conv_id how,  const char *text, int length)
   inbytes = length;
 
   do {
-    char *ip = text;
+    const char *ip = text;
     result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
                   &op, &outbytes);
 

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 84489c073c983a47b4cd033fea84b9b8c3cdc791..c575534c060a44eca7ef4f54b58109e39abb501c 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -53,14 +53,6 @@
 #include "flexifile-factory.h"
 
 PsppireDataStore *the_data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
-                               gchar **filename,
-                               gboolean *show_splash,
-                               GError **err);
-
-
 PsppireVarStore *the_var_store = 0;
 
 static void create_icon_factory (void);