Avoid warnings on some platforms.

diff --git a/src/ChangeLog b/src/ChangeLog
index c67051e03710706a4b25c94923dd61e701bc3d92..8659074d6a86452193f91012a51dac2386d2959d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       Avoid warnings on platforms where size_t is larger than int.
+       * msgfmt.c (check_pair): Use an 'unsigned int' variable instead of
+       'size_t', to avoid warnings.
+       * po-lex.h (po_gram_error): Cast line number to 'unsigned long'.
+       * po-lex.c (po_gram_error): Likewise.
+       * x-c.c (extract_c): Likewise.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
        * msgexec.c [BeOS]: Fix #ifdef conditional.

diff --git a/src/msgfmt.c b/src/msgfmt.c
index 9f4b0b73f1f523e4849eb26725845482c369032d..d20746f482db816cdcb2c9fb31edc92f6239e290 100644 (file)
--- a/src/msgfmt.c
+++ b/src/msgfmt.c
@@ -916,6 +916,7 @@ check_pair (msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos,
 {
   int has_newline;
   size_t i;
+  unsigned int j;
   const char *p;
 
   /* If the msgid string is empty we have the special entry reserved for
@@ -937,13 +938,13 @@ check_pair (msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos,
          error_with_progname = true;
          exit_status = EXIT_FAILURE;
        }
-      for (p = msgstr, i = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, i++)
+      for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++)
        if (TEST_NEWLINE(p) != has_newline)
          {
            error_with_progname = false;
            error_at_line (0, 0, msgid_pos->file_name, msgid_pos->line_number,
                           _("\
-`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"), i);
+`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"), j);
            error_with_progname = true;
            exit_status = EXIT_FAILURE;
          }
@@ -976,13 +977,13 @@ check_pair (msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos,
          error_with_progname = true;
          exit_status = EXIT_FAILURE;
        }
-      for (p = msgstr, i = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, i++)
+      for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++)
        if (TEST_NEWLINE(p) != has_newline)
          {
            error_with_progname = false;
            error_at_line (0, 0, msgid_pos->file_name, msgid_pos->line_number,
                           _("\
-`msgid' and `msgstr[%u]' entries do not both end with '\\n'"), i);
+`msgid' and `msgstr[%u]' entries do not both end with '\\n'"), j);
            error_with_progname = true;
            exit_status = EXIT_FAILURE;
          }

diff --git a/src/msgmerge.c b/src/msgmerge.c
index 7800f98368888e423e7463c7743d7b108541f4b3..2e72b3762d51f53b6ce4e5110442a47c0de2bac8 100644 (file)
--- a/src/msgmerge.c
+++ b/src/msgmerge.c
@@ -109,7 +109,8 @@ static void match_domain PARAMS ((const char *fn1, const char *fn2,
                                  message_list_list_ty *definitions,
                                  message_list_ty *refmlp,
                                  message_list_ty *resultmlp,
-                                 struct statistics *stats, int *processed));
+                                 struct statistics *stats,
+                                 unsigned int *processed));
 static msgdomain_list_ty *merge PARAMS ((const char *fn1, const char *fn2,
                                         msgdomain_list_ty **defp));
 
@@ -491,7 +492,7 @@ match_domain (fn1, fn2, definitions, refmlp, resultmlp, stats, processed)
      message_list_ty *refmlp;
      message_list_ty *resultmlp;
      struct statistics *stats;
-     int *processed;
+     unsigned int *processed;
 {
   size_t j;
 
@@ -586,7 +587,7 @@ merge (fn1, fn2, defp)
   msgdomain_list_ty *def;
   msgdomain_list_ty *ref;
   size_t j, k;
-  size_t processed;
+  unsigned int processed;
   struct statistics stats;
   msgdomain_list_ty *result;
   message_list_list_ty *definitions;

diff --git a/src/po-lex.c b/src/po-lex.c
index d0df8d19a20e9baba6ca4439badc6d4178c558e1..eee7d4d7c83dfca4f6f89124aafde6583711a9f0 100644 (file)
--- a/src/po-lex.c
+++ b/src/po-lex.c
@@ -112,15 +112,16 @@ po_gram_error (fmt, va_alist)
   vasprintf (&buffer, fmt, ap);
   va_end (ap);
   error_with_progname = false;
-  error (0, 0, "%s:%d:%d: %s" gram_pos.file_name, gram_pos.line_number,
-        gram_pos_column + 1, buffer);
+  error (0, 0, "%s:%lu:%d: %s", gram_pos.file_name,
+        (unsigned long) gram_pos.line_number, gram_pos_column + 1, buffer);
   error_with_progname = true;
 # else
-  char *totalfmt = xasprintf ("%s%s", "%s:%d:%d: ", fmt);
+  char *totalfmt = xasprintf ("%s%s", "%s:%lu:%d: ", fmt);
 
   error_with_progname = false;
-  error (0, 0, totalfmt, gram_pos.file_name, gram_pos.line_number,
-        gram_pos_column + 1, a1, a2, a3, a4, a5, a6, a7, a8);
+  error (0, 0, totalfmt, gram_pos.file_name,
+        (unsigned long) gram_pos.line_number, gram_pos_column + 1,
+        a1, a2, a3, a4, a5, a6, a7, a8);
   error_with_progname = true;
   free (totalfmt);
 # endif

diff --git a/src/po-lex.h b/src/po-lex.h
index d2d2b7418d5ab25c836e4adbccce256f5a807b11..344aa76e77fa69a6ee95c86cc6f4dd538d4034fc 100644 (file)
--- a/src/po-lex.h
+++ b/src/po-lex.h
@@ -78,10 +78,11 @@ extern void po_lex_pass_obsolete_entries PARAMS ((bool flag));
 
 # define po_gram_error(fmt, ...)                                           \
   do {                                                                     \
-    char *totalfmt = xasprintf ("%s%s", "%s:%d:%d: ", fmt);                \
+    char *totalfmt = xasprintf ("%s%s", "%s:%lu:%d: ", fmt);               \
     error_with_progname = false;                                           \
-    error (0, 0, totalfmt, gram_pos.file_name, gram_pos.line_number,       \
-          gram_pos_column + 1, __VA_ARGS__);                               \
+    error (0, 0, totalfmt, gram_pos.file_name,                             \
+          (unsigned long) gram_pos.line_number, gram_pos_column + 1,       \
+          __VA_ARGS__);                                                    \
     error_with_progname = true;                                                    \
     free (totalfmt);                                                       \
     if (*fmt == '.')                                                       \
@@ -97,7 +98,7 @@ extern void po_lex_pass_obsolete_entries PARAMS ((bool flag));
   do {                                                                     \
     error_with_progname = false;                                           \
     error_at_line (0, 0, (pos)->file_name, (pos)->line_number,             \
-                   fmt, __VA_ARGS__);                                      \
+                  fmt, __VA_ARGS__);                                       \
     error_with_progname = true;                                                    \
     if (*fmt == '.')                                                       \
       --error_message_count;                                               \

diff --git a/src/x-c.c b/src/x-c.c
index 3d206a612918418fc1c83b9ac1886fb71c100a8f..501979d23cb5a2a98520cd38720c0d053c89f9b6 100644 (file)
--- a/src/x-c.c
+++ b/src/x-c.c
@@ -1266,8 +1266,9 @@ extract_c (f, real_filename, logical_filename, mdlp)
               {
                 error_with_progname = false;
                 error (0, 0,
-                       _("%s:%d: warning: keyword nested in keyword arg"),
-                       token.pos.file_name, token.pos.line_number);
+                       _("%s:%lu: warning: keyword nested in keyword arg"),
+                       token.pos.file_name,
+                       (unsigned long) token.pos.line_number);
                 error_with_progname = true;
                 continue;
               }
@@ -1278,8 +1279,9 @@ extract_c (f, real_filename, logical_filename, mdlp)
                we punt and forget the outer keyword.  */
             error_with_progname = false;
             error (0, 0,
-                   _("%s:%d: warning: keyword between outer keyword and its arg"),
-                   token.pos.file_name, token.pos.line_number);
+                   _("%s:%lu: warning: keyword between outer keyword and its arg"),
+                   token.pos.file_name,
+                   (unsigned long) token.pos.line_number);
             error_with_progname = true;
           }
         commas_to_skip = token.argnum1 - 1;