X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/58fa16ef1e6d6c3a698d220409416bccec187287..c576ad2674c37a1c63f004c71049998f38854c64:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 50d7c4ca..791146a2 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -31,7 +31,7 @@ struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
 /*
  * static prototypes
  */
-static int match (char *, char *);
+static int match (char *, char *) PURE;
 static char *get_x400_friendly (char *, char *, int);
 static int get_x400_comp (char *, char *, char *, int);
 
@@ -72,8 +72,8 @@ cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
     if (wid == 0)
 	return;
     if (wid < 0)
-	wid = -wid;
-    if (wid < (num >= 0 ? max : max-1)) {
+        wid = -wid; /* OK because wid originally a short. */
+    if ((size_t)wid < (num >= 0 ? max : max-1)) {
 	/* Build up the string representation of num in reverse. */
 	charstring_t rev = charstring_create (0);
 	int i = num >= 0 ? num : -num;
@@ -841,7 +841,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	case FT_LV_RCLOCK:
 	    if ((value = fmt->f_comp->c_tws->tw_clock) == 0)
 		value = dmktime(fmt->f_comp->c_tws);
-	    value = time((time_t *) 0) - value;
+	    value = time(NULL) - value;
 	    break;
 	case FT_LV_DAYF:
 	    if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
@@ -989,7 +989,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 		*comp->c_tws = *tws;
 		comp->c_flags &= ~CF_TRUE;
 	    } else if ((comp->c_flags & CF_DATEFAB) == 0) {
-		memset (comp->c_tws, 0, sizeof *comp->c_tws);
+		ZERO(comp->c_tws);
 		comp->c_flags = CF_TRUE;
 	    }
 	    comp->c_flags |= CF_PARSED;
@@ -1206,5 +1206,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	}
     }
 
-    return (NULL);
+    return NULL;
 }