Mercurial > hg > th-libs

changeset 285:e1414cf8fef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some function arguments and variables.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 22 Feb 2016 13:45:07 +0200
parents 5a467b40800a
children 5cbdf215e42b
files th_string.c
diffstat 1 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/th_string.c	Mon Feb 22 13:43:28 2016 +0200
+++ b/th_string.c	Mon Feb 22 13:45:07 2016 +0200
@@ -138,7 +138,7 @@
 
 static int th_printf_vput_int(th_printf_ctx *ctx, th_printf_vputch vputch,
     int pval, const int radix, const char padMode, const char padChar,
-    const int width, const BOOL unsig, const BOOL upcase, const BOOL sign)
+    const int f_width, const BOOL unsig, const BOOL upcase, const BOOL f_sign)
 {
     char buf[64];
     size_t pos = 0;
@@ -177,13 +177,13 @@
     // Do we want a sign prefix? Not for unsigned values
     if (!unsig)
     {
-        char ch = sign ? (neg ? '-' : '+') : (neg ? '-' : 0);
+        char ch = f_sign ? (neg ? '-' : '+') : (neg ? '-' : 0);
         if (ch && (ret = vputch(ctx, ch)) == EOF)
             goto out;
     }
 
     // Calculate necessary padding, if any
-    int nwidth = width - pos;
+    int nwidth = f_width - pos;
 
     // Prefix padding?
     if (padMode != '-' && nwidth > 0 && (ret = th_printf_vput_pad(ctx, vputch, nwidth, padMode)) == EOF)
@@ -207,7 +207,7 @@
 
 static int th_printf_vput_str(th_printf_ctx *ctx, th_printf_vputch vputch,
     const char *str, const char padMode, const char padChar,
-    const int width, const int prec)
+    const int f_width, const int f_prec)
 {
     int nwidth, ret = 0;
 
@@ -215,7 +215,7 @@
     if (str == NULL)
         str = "(null)";
 
-    nwidth = width - strlen(str);
+    nwidth = f_width - strlen(str);
 
     // Prefix padding?
     if (padMode != '-' && nwidth > 0 && (ret = th_printf_vput_pad(ctx, vputch, nwidth, padMode)) == EOF)
@@ -250,15 +250,15 @@
         else
         {
             char padMode = ' ', padChar = 0;
-            BOOL sign = FALSE;
-            int width = 0, prec = -1;
+            BOOL f_sign = FALSE;
+            int f_width = 0, f_prec = -1;
 
             fmt++;
 
             // Check for field sign
             if (*fmt == '+')
             {
-                sign = TRUE;
+                f_sign = TRUE;
                 fmt++;
             }
 
@@ -280,7 +280,7 @@
 
             // Get field width
             while (th_isdigit(*fmt))
-                width = width * 10 + (*fmt++ - '0');
+                f_width = f_width * 10 + (*fmt++ - '0');
 
             // Check for precision
             if (*fmt == '.')
@@ -289,9 +289,9 @@
                 if (!th_isdigit(*fmt))
                     return -103;
 
-                prec = 0;
+                f_prec = 0;
                 while (th_isdigit(*fmt))
-                    prec = prec * 10 + (*fmt++ - '0');
+                    f_prec = f_prec * 10 + (*fmt++ - '0');
             }
 
             switch (*fmt)
@@ -300,7 +300,7 @@
                     return -104;
 
                 case 'c':
-                    if (padMode != ' ' || width > 0 || prec >= 0 || sign)
+                    if (padMode != ' ' || f_width > 0 || f_prec >= 0 || f_sign)
                         return -105;
 
                     if ((ret = vputch(ctx, va_arg(ap, int))) == EOF)
@@ -309,21 +309,21 @@
 
                 case 'u':
                 case 'd':
-                    if ((padMode != '0' && padMode != '-' && padMode != ' ') || prec >= 0)
+                    if ((padMode != '0' && padMode != '-' && padMode != ' ') || f_prec >= 0)
                         return -105;
 
                     if ((ret = th_printf_vput_int(ctx, vputch, va_arg(ap, unsigned int),
-                        10, padMode, padChar, width, *fmt == 'u', FALSE, sign)) == EOF)
+                        10, padMode, padChar, f_width, *fmt == 'u', FALSE, f_sign)) == EOF)
                         goto out;
                     break;
 
                 case 'x':
                 case 'X':
-                    if ((padMode != '0' && padMode != '-' && padMode != ' ') || prec >= 0)
+                    if ((padMode != '0' && padMode != '-' && padMode != ' ') || f_prec >= 0)
                         return -106;
 
                     if ((ret = th_printf_vput_int(ctx, vputch, va_arg(ap, unsigned int),
-                        16, padMode, padChar, width, TRUE, *fmt == 'X', FALSE)) == EOF)
+                        16, padMode, padChar, f_width, TRUE, *fmt == 'X', FALSE)) == EOF)
                         goto out;
                     break;
 
@@ -332,10 +332,10 @@
                     break;
 
                 case 's':
-                    if ((padMode != '-' && padMode != ' ') || sign)
+                    if ((padMode != '-' && padMode != ' ') || f_sign)
                         return -108;
 
-                    if ((ret = th_printf_vput_str(ctx, vputch, va_arg(ap, char *), padMode, padChar, width, prec)) == EOF)
+                    if ((ret = th_printf_vput_str(ctx, vputch, va_arg(ap, char *), padMode, padChar, f_width, f_prec)) == EOF)
                         goto out;
                     break;