X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=snprintf.c;h=fcfcbb74885744b7fd67172ae40b3269ddbd94e2;hp=0eac0922a7fd4463825144b5553c3647824ca2ae;hb=89af1bcd125ce7dfd30acf684a4fdc98c44e36bc;hpb=841934011451205d8295ac955486f06c317fdf15

diff --git a/snprintf.c b/snprintf.c
index 0eac092..fcfcbb7 100644
--- a/snprintf.c
+++ b/snprintf.c
@@ -47,8 +47,10 @@
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
 
 #include <string.h>
-# include <ctype.h>
+#include <ctype.h>
 #include <sys/types.h>
+#include "lib/str.h"
+#include "lib/debug.h"
 
 /* Define this as a fall through, HAVE_STDARG_H is probably already set */
 
@@ -400,7 +402,7 @@ static void fmtstr (char *buffer, size_t * currlen, size_t maxlen,
     value = "<NULL>";
   }
 
-  for (strln = 0; value[strln]; ++strln);       /* mutt_strlen */
+  for (strln = 0; value[strln]; ++strln);       /* str_len */
   padlen = min - strln;
   if (padlen < 0)
     padlen = 0;
@@ -478,7 +480,7 @@ static void fmtint (char *buffer, size_t * currlen, size_t maxlen,
     spadlen = -spadlen;         /* Left Justifty */
 
 #ifdef DEBUG_SNPRINTF
-  dprint (1, (debugfile, "zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
+  debug_print (1, ("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
               zpadlen, spadlen, min, max, place));
 #endif
 
@@ -601,7 +603,7 @@ static void fmtfp (char *buffer, size_t * currlen, size_t maxlen,
   }
 
 #ifdef DEBUG_SNPRINTF
-  dprint (1, (debugfile, "fmtfp: %f =? %d.%d\n", fvalue, intpart, fracpart));
+  debug_print (1, ("fmtfp: %f =? %d.%d\n", fvalue, intpart, fracpart));
 #endif
 
   /* Convert integer part */
@@ -687,7 +689,7 @@ int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
   str[0] = 0;
   dopr (str, count, fmt, args);
-  return (mutt_strlen (str));
+  return (str_len (str));
 }
 #endif /* !HAVE_VSNPRINTF */
 
@@ -715,7 +717,7 @@ int snprintf (va_alist)
 
   (void) vsnprintf (str, count, fmt, ap);
   VA_END;
-  return (mutt_strlen (str));
+  return (str_len (str));
 }
 
 #ifdef TEST_SNPRINTF
@@ -766,7 +768,7 @@ int main (void)
     for (y = 0; fp_nums[y] != 0; y++) {
       snprintf (buf1, sizeof (buf1), fp_fmt[x], fp_nums[y]);
       sprintf (buf2, fp_fmt[x], fp_nums[y]);
-      if (strcmp (buf1, buf2)) {
+      if (str_cmp (buf1, buf2)) {
         printf ("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n",        /* __SPRINTF_CHECKED__ */
                 fp_fmt[x], buf1, buf2);
         fail++;
@@ -778,7 +780,7 @@ int main (void)
     for (y = 0; int_nums[y] != 0; y++) {
       snprintf (buf1, sizeof (buf1), int_fmt[x], int_nums[y]);
       sprintf (buf2, int_fmt[x], int_nums[y]);
-      if (strcmp (buf1, buf2)) {
+      if (str_cmp (buf1, buf2)) {
         printf ("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n",        /* __SPRINTF_CHECKED__ */
                 int_fmt[x], buf1, buf2);
         fail++;