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

diff --git a/snprintf.c b/snprintf.c
index 2ec459b..fcfcbb7 100644
--- a/snprintf.c
+++ b/snprintf.c
@@ -402,7 +402,7 @@ static void fmtstr (char *buffer, size_t * currlen, size_t maxlen,
     value = "<NULL>";
   }
 
-  for (strln = 0; value[strln]; ++strln);       /* safe_strlen */
+  for (strln = 0; value[strln]; ++strln);       /* str_len */
   padlen = min - strln;
   if (padlen < 0)
     padlen = 0;
@@ -689,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 (safe_strlen (str));
+  return (str_len (str));
 }
 #endif /* !HAVE_VSNPRINTF */
 
@@ -717,7 +717,7 @@ int snprintf (va_alist)
 
   (void) vsnprintf (str, count, fmt, ap);
   VA_END;
-  return (safe_strlen (str));
+  return (str_len (str));
 }
 
 #ifdef TEST_SNPRINTF
@@ -768,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 (safe_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++;
@@ -780,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 (safe_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++;