X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=c9b882da395bb987e89496cebabea4db28700d94;hb=102679e27468bf6f8e1da24ccb9b0d93c489ec7e;hp=4f79bf6a4964a6eb3b9a05505e815571c7cf3e12;hpb=0e02bd46c1b4931073f3e865bbad4deb15691fd7;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 4f79bf6..c9b882d 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -88,7 +88,6 @@ match (char *str, char *sub)
 /*
  * macros to format data
  */
-
 #define PUTDF(cp, num, wid, fill)\
 	if (cp + wid < ep) {\
 	    if ((i = (num)) < 0)\
@@ -109,26 +108,6 @@ match (char *str, char *sub)
 	    cp += c;\
 	    }
 
-#define PUTD(cp, num)\
-	if (cp < ep) {\
-	    if ((i = (num)) == 0)\
-		*cp++ = '0';\
-	    else {\
-		if ((i = (num)) < 0) {\
-		    *cp++ = '-';\
-		    i = -(num);\
-		    }\
-		c = 10;\
-		while (c <= i) \
-		    c *= 10;\
-		while (cp < ep && c > 1) {\
-		    c /= 10;\
-		    *cp++ = (i / c) + '0';\
-		    i %= c;\
-		    }\
-		}\
-	    }
-
 #ifdef LOCALE
 #define PUTSF(cp, str, wid, fill) {\
 		ljust = 0;\
@@ -286,7 +265,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
     char *cp, *ep, *sp;
     char *savestr, *str = NULL;
     char buffer[BUFSIZ], buffer2[BUFSIZ];
-    int i, c, ljust;
+    int i, c, ljust, n;
     int value = 0;
     time_t t;
     struct format *fmt;
@@ -346,7 +325,8 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	    adios (NULL, "internal error (FT_STRFW)");
 
 	case FT_NUM:
-	    PUTD (cp, value);
+	    n = snprintf(cp, ep - cp, "%d", value);
+	    if (n >= 0) cp += n;
 	    break;
 	case FT_NUMF:
 	    PUTDF (cp, value, fmt->f_width, fmt->f_fill);