Merge branch 'fileproc_mhlproc_to_post'

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index ca4020b..8d03836 100644 (file)
--- 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 */
@@ -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;