From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Mar 2011 05:07:42 +0000 (-0700)
Subject: * xftfont.c (xftfont_open): Rename locals to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=001a7ab41b79b45c0c6a1b5b90fe4ed9bbfe4e14;p=emacs.git

* xftfont.c (xftfont_open): Rename locals to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ef0999b8454..37534dc6c64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xftfont.c (xftfont_shape): Now static, and defined only if needed.
+	(xftfont_open): Rename locals to avoid shadowing.
 
 	* ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
 	(ftfont_otf_capability, ftfont_shape): Omit decls if not needed.
diff --git a/src/xftfont.c b/src/xftfont.c
index 7c8b5dde070..c27a4fcf91a 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -280,7 +280,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
 {
   FcResult result;
   Display *display = FRAME_X_DISPLAY (f);
-  Lisp_Object val, filename, index, font_object;
+  Lisp_Object val, filename, idx, font_object;
   FcPattern *pat = NULL, *match;
   struct xftfont_info *xftfont_info = NULL;
   struct font *font;
@@ -298,7 +298,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
     return Qnil;
   val = XCDR (val);
   filename = XCAR (val);
-  index = XCDR (val);
+  idx = XCDR (val);
   size = XINT (AREF (entity, FONT_SIZE_INDEX));
   if (size == 0)
     size = pixel_size;
@@ -335,7 +335,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   xftfont_add_rendering_parameters (pat, entity);
 
   FcPatternAddString (pat, FC_FILE, (FcChar8 *) SDATA (filename));
-  FcPatternAddInteger (pat, FC_INDEX, XINT (index));
+  FcPatternAddInteger (pat, FC_INDEX, XINT (idx));
 
 
   BLOCK_INPUT;
@@ -409,9 +409,9 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
     spacing = FC_PROPORTIONAL;
   if (! ascii_printable[0])
     {
-      int i;
-      for (i = 0; i < 95; i++)
-	ascii_printable[i] = ' ' + i;
+      int ch;
+      for (ch = 0; ch < 95; ch++)
+	ascii_printable[ch] = ' ' + ch;
     }
   BLOCK_INPUT;
   if (spacing != FC_PROPORTIONAL