[Pspp-cvs] pspp Smake po/de.po po/pspp.pot src/libpspp/i18...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/04/28 03:32:11

Modified files:
        .              : Smake 
        po             : de.po pspp.pot 
        src/libpspp    : i18n.c 
        src/ui/gui     : psppire.c 

Log message:
        Fix warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/i18n.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.40&r2=1.41

Patches:
Index: Smake
===================================================================
RCS file: /sources/pspp/pspp/Smake,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Smake       23 Apr 2007 01:26:31 -0000      1.57
+++ Smake       28 Apr 2007 03:32:11 -0000      1.58
@@ -17,6 +17,7 @@
        fpieee \
        full-read \
        full-write \
+        fseeko \
        fwriteerror \
        gethostname \
        getline \

Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- po/de.po    25 Apr 2007 00:09:36 -0000      1.47
+++ po/de.po    28 Apr 2007 03:32:11 -0000      1.48
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -3415,6 +3415,24 @@
 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 @@
 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

Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- po/pspp.pot 25 Apr 2007 00:09:36 -0000      1.132
+++ po/pspp.pot 28 Apr 2007 03:32:11 -0000      1.133
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -3409,6 +3409,24 @@
 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 @@
 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

Index: src/libpspp/i18n.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/i18n.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/libpspp/i18n.c  25 Apr 2007 00:09:36 -0000      1.7
+++ src/libpspp/i18n.c  28 Apr 2007 03:32:11 -0000      1.8
@@ -97,7 +97,7 @@
   inbytes = length;
 
   do {
-    char *ip = text;
+    const char *ip = text;
     result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
                   &op, &outbytes);
 

Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- src/ui/gui/psppire.c        26 Apr 2007 09:57:52 -0000      1.40
+++ src/ui/gui/psppire.c        28 Apr 2007 03:32:11 -0000      1.41
@@ -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);