X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=8d0383608c03053b66e24d615526d791de6c259e;hb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;hp=c3d265a1f9638f92792ff2c46af40f15bcda314c;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index c3d265a..8d03836 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -2,8 +2,6 @@
 /*
  * fmt_scan.c -- format string interpretation
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -128,10 +126,11 @@ cpnumber(char **dest, int num, unsigned int wid, char fill, size_t n) {
 static void
 cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
     int remaining;     /* remaining output width available */
-    int c, ljust, w;
+    int c, ljust;
     int end;           /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */
+    int w;
     wchar_t wide_char;
 #endif
     char *sp;          /* current position in source string */
@@ -288,7 +287,7 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
 	    || !(cp = strchr(mbox += idx + strlen (key), '/')))
 	return 0;
 
-    snprintf (buffer, buffer_len, "%*.*s", cp - mbox, cp - mbox, mbox);
+    snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
     return 1;
 }
 
@@ -297,7 +296,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 {
     char *cp, *ep;
     unsigned char *sp;
-    char *savestr;
+    char *savestr = NULL;
     unsigned char *str = NULL;
     char buffer[BUFSIZ], buffer2[BUFSIZ];
     int i, c, ljust, n;