[Pspp-cvs] pspp/src libpspp/i18n.c output/dummy-chart.c ui...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/02/21 08:27:16

Modified files:
        src/libpspp    : i18n.c 
        src/output     : dummy-chart.c 
        src/ui/gui     : var-sheet.c 

Log message:
        Fix warnings when compiling with mingw32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/i18n.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/dummy-chart.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.19&r2=1.20

Patches:
Index: libpspp/i18n.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/i18n.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libpspp/i18n.c      16 Dec 2006 04:26:43 -0000      1.4
+++ libpspp/i18n.c      21 Feb 2007 08:27:16 -0000      1.5
@@ -67,7 +67,6 @@
   char *outbuf = 0;
   size_t outbufferlength;
   size_t result;
-  char *ip ;
   char *op ;
   size_t inbytes = 0;
   size_t outbytes ;
@@ -92,13 +91,12 @@
 
   outbuf = xmalloc(outbufferlength);
   op = outbuf;
-  ip = (char *) text;
 
   outbytes = outbufferlength;
   inbytes = length;
   
   do {
-    result = iconv(convertor[how], &ip, &inbytes, 
+    result = iconv(convertor[how], &text, &inbytes, 
                   &op, &outbytes);
 
     if ( -1 == result ) 
@@ -113,7 +111,7 @@
              {
                *op++ = fallbackchar;
                outbytes--;
-               ip++;
+               text++;
                inbytes--;
                break;
              }
@@ -123,7 +121,6 @@
            outbufferlength <<= 1;
            outbuf = xmalloc(outbufferlength);
            op = outbuf;
-           ip = (char *) text;
            outbytes = outbufferlength;
            inbytes = length;
            break;

Index: output/dummy-chart.c
===================================================================
RCS file: /sources/pspp/pspp/src/output/dummy-chart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- output/dummy-chart.c        16 Dec 2006 04:26:43 -0000      1.2
+++ output/dummy-chart.c        21 Feb 2007 08:27:16 -0000      1.3
@@ -17,8 +17,9 @@
    02110-1301, USA. */
 
 #include <config.h>
-
 #include <stdio.h>
+#include <libpspp/compiler.h>
+#include "chart.h"
 
 
 struct chart *
@@ -28,7 +29,7 @@
 }
 
 void
-chart_submit(struct chart *chart)
+chart_submit(struct chart *chart UNUSED)
 {
 }
 

Index: ui/gui/var-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- ui/gui/var-sheet.c  7 Feb 2007 02:12:57 -0000       1.19
+++ ui/gui/var-sheet.c  21 Feb 2007 08:27:16 -0000      1.20
@@ -33,7 +33,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#if HAVE_LANGINFO_H
 #include <langinfo.h>
+#endif
 
 #include <data/value.h>
 
@@ -444,10 +446,12 @@
   gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
 
 
+#if HAVE_LANGINFO_H
   /* Since this happens inside glade_xml_new, we must prevent strings from
    * being re-encoded twice */
   codeset = bind_textdomain_codeset (PACKAGE, 0);
   bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
+#endif
   for (i = 0 ; i < n_COLS ; ++i )
     {
       g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
@@ -456,7 +460,9 @@
       g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
                                               column_def[i].width);
     }
+#if HAVE_LANGINFO_H
   bind_textdomain_codeset (PACKAGE, codeset);
+#endif
 
   gtk_widget_show (sheet);