Changeset 1438 for libcaca/trunk/tools/makefont.cTweet

Timestamp:

Nov 27, 2006, 3:53:17 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fix shadowing declarations.

File:

• libcaca/trunk/tools/makefont.c (modified) (6 diffs)

libcaca/trunk/tools/makefont.c

@@ -92 +92 @@
     FT_Bitmap img;
     int stdwidth, fullwidth, height, blocks, glyphs, fullglyphs;
-    unsigned int n, b, i, index;
+    unsigned int n, b, i;
     unsigned int stdsize, fullsize, control_size, data_size, current_offset;
     uint8_t *glyph_data;
@@ -226 +226 @@
 
     /* Render all glyphs, so that we can know their offset */
-    current_offset = n = index = 0;
+    current_offset = n = 0;
     for(b = 0; blocklist[b + 1]; b += 2)
     {
@@ -420 +420 @@
 static int printf_unicode(struct glyph *g)
 {
-    int written = 0;
-
-    written += printf("U+%.04X: \"", g->unicode);
+    int wr = 0;
+
+    wr += printf("U+%.04X: \"", g->unicode);
 
     if(g->unicode < 0x20 || (g->unicode >= 0x7f && g->unicode <= 0xa0))
-        written += printf("\\x%.02x\"", g->unicode);
+        wr += printf("\\x%.02x\"", g->unicode);
     else
-        written += printf("%s\"", g->buf);
-
-    return written;
+        wr += printf("%s\"", g->buf);
+
+    return wr;
 }
 
@@ -448 +448 @@
     char buf[BUFSIZ];
     char *parser = buf;
-    int rewind = 0; /* we use this variable to rewind 2 bytes after \000
-                     * was printed when the next char starts with "\", too. */
+    int rev = 0; /* we use this variable to rewind 2 bytes after \000
+                  * was printed when the next char starts with "\", too. */
 
     while(bytes--)
@@ -459 +459 @@
             parser += sprintf(parser, "\", \"");
             written = 0;
-            rewind = 0;
+            rev = 0;
         }
 
         if(ch == '\\' || ch == '"')
         {
-            parser -= rewind;
+            parser -= rev;
             parser += sprintf(parser, "\\%c", ch);
-            rewind = 0;
+            rev = 0;
         }
         else if(ch >= 0x20 && ch < 0x7f)
         {
             parser += sprintf(parser, "%c", ch);
-            rewind = 0;
+            rev = 0;
         }
         else
         {
-            parser -= rewind;
+            parser -= rev;
             parser += sprintf(parser, "\\%.03o", ch);
-            rewind = ch ? 0 : 2;
+            rev = ch ? 0 : 2;
         }
 
@@ -483 +483 @@
     }
 
-    parser -= rewind;
+    parser -= rev;
     parser[0] = '\0';