Load cups into easysw/current.

[thirdparty/cups.git] / cups / transcode.c

diff --git a/cups/transcode.c b/cups/transcode.c
index 70bf40f1d81e4224fff4040198f46acc298e9765..92a7bfb97f11e2ea16df3e26be664d363dbcc55a 100644 (file)
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.c 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: transcode.c 6592 2007-06-21 21:04:40Z mike $"
  *
  *   Transcoding support for the Common UNIX Printing System (CUPS).
  *
@@ -1435,7 +1435,7 @@ get_vbcs_charmap(
   char         *s;                     /* Line parsing pointer */
   char         line[256];              /* Line from charset map file */
   int          i;                      /* Loop variable */
-  int          wide;                   /* 32-bit legacy char */
+  int          legacy;                 /* 32-bit legacy char */
 
 
   DEBUG_printf(("get_vbcs_charmap(encoding=%d, filename=\"%s\")\n",
@@ -1504,8 +1504,8 @@ get_vbcs_charmap(
 
   cupsFileRewind(fp);
 
-  i    = 0;
-  wide = 0;
+  i      = 0;
+  legacy = 0;
 
   while (cupsFileGets(fp, line, sizeof(line)))
   {
@@ -1575,9 +1575,9 @@ get_vbcs_charmap(
       * Save VBCS 32-bit to Unicode mapping in sorted list table...
       */
 
-      if (!wide)
+      if (!legacy)
       {
-       wide            = 1;
+       legacy          = 1;
        vmap->widecount = (mapcount - i + 1);
        wide2uni        = (_cups_wide2uni_t *)calloc(vmap->widecount,
                                                     sizeof(_cups_wide2uni_t));
@@ -1655,5 +1655,5 @@ get_vbcs_charmap(
 
 
 /*
- * End of "$Id: transcode.c 6187 2007-01-10 16:20:42Z mike $"
+ * End of "$Id: transcode.c 6592 2007-06-21 21:04:40Z mike $"
  */