--- glib-2.44.1/gio/gdummyfile.c.org	2014-12-20 06:49:48.000000000 +0900
+++ glib-2.44.1/gio/gdummyfile.c	2015-08-30 11:55:32.577794900 +0900
@@ -441,7 +441,7 @@
 		 const gchar *escaped_string_end,
 		 const gchar *illegal_characters)
 {
-  const gchar *in;
+  const gchar *in_dummy;
   gchar *out, *result;
   gint character;
   
@@ -454,19 +454,19 @@
   result = g_malloc (escaped_string_end - escaped_string + 1);
 	
   out = result;
-  for (in = escaped_string; in < escaped_string_end; in++) 
+  for (in_dummy = escaped_string; in_dummy < escaped_string_end; in_dummy++) 
     {
-      character = *in;
-      if (*in == '%') 
+      character = *in_dummy;
+      if (*in_dummy == '%') 
         {
-          in++;
-          if (escaped_string_end - in < 2)
+          in_dummy++;
+          if (escaped_string_end - in_dummy < 2)
 	    {
 	      g_free (result);
 	      return NULL;
 	    }
       
-          character = unescape_character (in);
+          character = unescape_character (in_dummy);
       
           /* Check for an illegal character. We consider '\0' illegal here. */
           if (character <= 0 ||
@@ -476,7 +476,7 @@
 	      g_free (result);
 	      return NULL;
 	    }
-          in++; /* The other char will be eaten in the loop header */
+          in_dummy++; /* The other char will be eaten in the loop header */
         }
       *out++ = (char)character;
     }
@@ -516,7 +516,7 @@
 _g_decode_uri (const char *uri)
 {
   GDecodedUri *decoded;
-  const char *p, *in, *hier_part_start, *hier_part_end, *query_start, *fragment_start;
+  const char *p, *in_dummy, *hier_part_start, *hier_part_end, *query_start, *fragment_start;
   char *out;
   char c;
 
@@ -551,8 +551,8 @@
   
   decoded->scheme = g_malloc (p - uri);
   out = decoded->scheme;
-  for (in = uri; in < p - 1; in++)
-    *out++ = g_ascii_tolower (*in);
+  for (in_dummy = uri; in_dummy < p - 1; in_dummy++)
+    *out++ = g_ascii_tolower (*in_dummy);
   *out = 0;
 
   hier_part_start = p;