GNOME.org
 

[retro-gtk] Declare iterator variables in their for loop

commit c3135bca00da37e296ca356caff33cc2fb9970a5
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Dec 21 15:29:39 2020 +0100

    Declare iterator variables in their for loop
    
    This helps making the type of iterators clearer, and that the final
    iterated values aren't used later. If an iterator variable is reused but
    not to get the final iterated value, the variable is renamed to avoid
    confusion.

 demos/retro-demo.c                   |  3 +--
 retro-gtk/retro-core-descriptor.c    |  6 ++----
 retro-gtk/retro-core-view.c          |  3 +--
 retro-gtk/retro-core.c               | 16 +++++++---------
 retro-gtk/retro-gl-display.c         | 17 +++++++----------
 retro-gtk/retro-key-joypad-mapping.c |  3 +--
 retro-gtk/retro-pixdata.c            |  6 +++---
 retro-runner/ipc-runner-impl.c       |  3 +--
 retro-runner/retro-core.c            |  3 +--
 retro-runner/retro-environment.c     |  8 +++-----
 retro-runner/retro-gl-renderer.c     |  7 ++-----
 tests/retro-reftest-file.c           | 22 ++++++++++------------
 tests/retro-reftest.c                | 23 ++++++++++-------------
 13 files changed, 49 insertions(+), 71 deletions(-)
---
diff --git a/demos/retro-demo.c b/demos/retro-demo.c
index a0b2232..c2b8889 100644
--- a/demos/retro-demo.c
+++ b/demos/retro-demo.c
@@ -42,10 +42,9 @@ retro_demo_open (GApplication  *application,
 
   if (n_files > 1) {
     gchar **medias;
-    gint i;
 
     medias = g_new0 (gchar *, n_files);
-    for (i = 1; i < n_files; i++)
+    for (gsize i = 1; i < n_files; i++)
       medias[i - 1] = g_file_get_uri (files[i]);
     retro_core_set_medias (self->core, (const gchar *const *) medias);
     g_strfreev (medias);
diff --git a/retro-gtk/retro-core-descriptor.c b/retro-gtk/retro-core-descriptor.c
index 45dfc16..007997e 100644
--- a/retro-gtk/retro-core-descriptor.c
+++ b/retro-gtk/retro-core-descriptor.c
@@ -280,7 +280,6 @@ check_platform_group (RetroCoreDescriptor  *self,
 {
   gboolean has_key;
   gchar **firmwares;
-  gchar **firmware_p;
   gchar *firmware_group;
   GError *tmp_error = NULL;
 
@@ -315,7 +314,7 @@ check_platform_group (RetroCoreDescriptor  *self,
     return;
   }
 
-  for (firmware_p = firmwares; *firmware_p != NULL; firmware_p++) {
+  for (GStrv firmware_p = firmwares; *firmware_p != NULL; firmware_p++) {
     firmware_group = g_strconcat (RETRO_CORE_DESCRIPTOR_FIRMWARE_GROUP_PREFIX, *firmware_p, NULL);
     if (!g_key_file_has_group (self->key_file, firmware_group)) {
       g_set_error (error,
@@ -966,7 +965,6 @@ retro_core_descriptor_new (const gchar  *filename,
   RetroCoreDescriptor *self;
   gchar ** groups;
   gsize groups_length;
-  gsize i;
   GError *tmp_error = NULL;
 
   g_return_val_if_fail (filename != NULL, NULL);
@@ -994,7 +992,7 @@ retro_core_descriptor_new (const gchar  *filename,
   }
 
   groups = g_key_file_get_groups (self->key_file, &groups_length);
-  for (i = 0; i < groups_length; i++) {
+  for (gsize i = 0; i < groups_length; i++) {
     if (g_str_has_prefix (groups[i],
                           RETRO_CORE_DESCRIPTOR_PLATFORM_GROUP_PREFIX)) {
       check_platform_group (self, groups[i], &tmp_error);
diff --git a/retro-gtk/retro-core-view.c b/retro-gtk/retro-core-view.c
index 83990da..d5965b6 100644
--- a/retro-gtk/retro-core-view.c
+++ b/retro-gtk/retro-core-view.c
@@ -658,7 +658,6 @@ void
 retro_core_view_set_as_default_controller (RetroCoreView *self,
                                            RetroCore     *core)
 {
-  RetroControllerType type;
   RetroController *controller;
   guint64 capabilities;
 
@@ -667,7 +666,7 @@ retro_core_view_set_as_default_controller (RetroCoreView *self,
 
   capabilities = retro_core_view_get_controller_capabilities (self);
 
-  for (type = RETRO_CONTROLLER_TYPE_NONE;
+  for (RetroControllerType type = RETRO_CONTROLLER_TYPE_NONE;
        type < RETRO_CONTROLLER_TYPE_COUNT;
        type++) {
     if ((capabilities & (1 << type)) == 0)
diff --git a/retro-gtk/retro-core.c b/retro-gtk/retro-core.c
index 0e5a1c8..decd61d 100644
--- a/retro-gtk/retro-core.c
+++ b/retro-gtk/retro-core.c
@@ -167,7 +167,6 @@ static void
 retro_core_finalize (GObject *object)
 {
   RetroCore *self = RETRO_CORE (object);
-  gint i;
 
   retro_core_set_keyboard (self, NULL);
   g_object_unref (self->framebuffer);
@@ -175,7 +174,7 @@ retro_core_finalize (GObject *object)
   if (self->media_uris != NULL)
     g_strfreev (self->media_uris);
 
-  for (i = 0; i < RETRO_CONTROLLER_TYPE_COUNT; i++)
+  for (gsize i = 0; i < RETRO_CONTROLLER_TYPE_COUNT; i++)
     if (self->default_controllers[i])
       free_default_controller_info (self->default_controllers[i]);
   g_object_unref (self->default_controller_state);
@@ -1123,7 +1122,7 @@ retro_core_boot (RetroCore  *self,
   GHashTableIter iter;
   RetroCoreControllerInfo *info;
   g_autoptr (GPtrArray) medias_array = NULL;
-  gint length, i;
+  gint length;
   GError *tmp_error = NULL;
   IpcRunner *proxy;
   GVariant *variables;
@@ -1166,7 +1165,7 @@ retro_core_boot (RetroCore  *self,
   medias_array = g_ptr_array_new ();
   if (self->media_uris) {
     length = g_strv_length (self->media_uris);
-    for (i = 0; i < length; i++)
+    for (gsize i = 0; i < length; i++)
       g_ptr_array_add (medias_array, self->media_uris[i]);
   }
   g_ptr_array_add (medias_array, NULL);
@@ -1545,7 +1544,7 @@ sync_controller_for_type (RetroControllerState *state,
 {
   RetroInput input;
   g_autofree gint16 *data = NULL;
-  gint id, index, max_id, max_index, next;
+  gint max_id, max_index, next;
 
   if (!retro_controller_has_capability (controller, type))
     return;
@@ -1556,8 +1555,8 @@ sync_controller_for_type (RetroControllerState *state,
   data = g_new (gint16, max_index * max_id);
   next = 0;
 
-  for (index = 0; index < max_index; index++) {
-    for (id = 0; id < max_id; id++) {
+  for (gint index = 0; index < max_index; index++) {
+    for (gint id = 0; id < max_id; id++) {
       retro_input_init (&input, type, id, index);
       data[next++] = retro_controller_get_input_state (controller, &input);
     }
@@ -1579,14 +1578,13 @@ static void
 controller_state_changed_cb (RetroController         *controller,
                              RetroCoreControllerInfo *info)
 {
-  gint type;
   gboolean rumble = retro_controller_get_supports_rumble (info->controller);
 
   retro_controller_state_lock (info->state);
 
   retro_controller_state_set_supports_rumble (info->state, rumble);
 
-  for (type = 1; type < RETRO_CONTROLLER_TYPE_COUNT; type++)
+  for (gsize type = 1; type < RETRO_CONTROLLER_TYPE_COUNT; type++)
     if (retro_controller_has_capability (info->controller, type))
       sync_controller_for_type (info->state, info->controller, type);
     else
diff --git a/retro-gtk/retro-gl-display.c b/retro-gtk/retro-gl-display.c
index 0b4a08d..c637e34 100644
--- a/retro-gtk/retro-gl-display.c
+++ b/retro-gtk/retro-gl-display.c
@@ -208,7 +208,7 @@ realize (RetroGLDisplay *self)
   GLuint vertex_buffer_object;
   GLuint vertex_array_object;
   GLuint element_buffer_object;
-  RetroVideoFilter filter;
+  RetroVideoFilter current_filter;
   GError *inner_error = NULL;
 
   gtk_gl_area_make_current (GTK_GL_AREA (self));
@@ -224,7 +224,7 @@ realize (RetroGLDisplay *self)
   glBindBuffer (GL_ELEMENT_ARRAY_BUFFER, element_buffer_object);
   glBufferData (GL_ELEMENT_ARRAY_BUFFER, sizeof (elements), elements, GL_STATIC_DRAW);
 
-  for (filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++) {
+  for (RetroVideoFilter filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++) {
     RetroGLSLShader *shader;
 
     self->glsl_filter[filter] = retro_glsl_filter_new (filter_uris[filter], &inner_error);
@@ -262,12 +262,12 @@ realize (RetroGLDisplay *self)
   glGenTextures (1, &self->texture);
   glBindTexture (GL_TEXTURE_2D, self->texture);
 
-  filter = self->filter >= RETRO_VIDEO_FILTER_COUNT ?
+  current_filter = self->filter >= RETRO_VIDEO_FILTER_COUNT ?
     RETRO_VIDEO_FILTER_SMOOTH :
     self->filter;
 
-  if (self->glsl_filter[filter] != NULL) {
-    RetroGLSLShader *shader = retro_glsl_filter_get_shader (self->glsl_filter[filter]);
+  if (self->glsl_filter[current_filter] != NULL) {
+    RetroGLSLShader *shader = retro_glsl_filter_get_shader (self->glsl_filter[current_filter]);
     retro_glsl_shader_use_program (shader);
   }
 
@@ -277,13 +277,11 @@ realize (RetroGLDisplay *self)
 static void
 unrealize (RetroGLDisplay *self)
 {
-  RetroVideoFilter filter;
-
   gtk_gl_area_make_current (GTK_GL_AREA (self));
 
   glDeleteTextures (1, &self->texture);
   self->texture = 0;
-  for (filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++)
+  for (RetroVideoFilter filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++)
     g_clear_object (&self->glsl_filter[filter]);
 }
 
@@ -314,11 +312,10 @@ static void
 retro_gl_display_finalize (GObject *object)
 {
   RetroGLDisplay *self = (RetroGLDisplay *) object;
-  RetroVideoFilter filter;
 
   glDeleteTextures (1, &self->texture);
   self->texture = 0;
-  for (filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++)
+  for (RetroVideoFilter filter = 0; filter < RETRO_VIDEO_FILTER_COUNT; filter++)
     g_clear_object (&self->glsl_filter[filter]);
   if (self->core != NULL)
     g_object_unref (self->core);
diff --git a/retro-gtk/retro-key-joypad-mapping.c b/retro-gtk/retro-key-joypad-mapping.c
index 4a6a2da..05eac05 100644
--- a/retro-gtk/retro-key-joypad-mapping.c
+++ b/retro-gtk/retro-key-joypad-mapping.c
@@ -131,11 +131,10 @@ RetroKeyJoypadMapping *
 retro_key_joypad_mapping_new_default (void)
 {
   RetroKeyJoypadMapping *self;
-  RetroJoypadId button;
 
   self = g_object_new (RETRO_TYPE_KEY_JOYPAD_MAPPING, NULL);
 
-  for (button = 0; button < RETRO_JOYPAD_ID_COUNT; button ++)
+  for (RetroJoypadId button = 0; button < RETRO_JOYPAD_ID_COUNT; button ++)
     /* GDK adds 8 to the Linux input event codes to create the hardware keycode.
      * These codes are the only ones not coming from GDK so lets standardize on
      * what GDK does.
diff --git a/retro-gtk/retro-pixdata.c b/retro-gtk/retro-pixdata.c
index 7787465..5528937 100644
--- a/retro-gtk/retro-pixdata.c
+++ b/retro-gtk/retro-pixdata.c
@@ -137,13 +137,13 @@ rgba8888_from_video (gconstpointer  src,
                      gsize          pitch,
                      GetRGBA8888    get_pixel)
 {
-  gsize row, src_row, dst_row, col, src_col;
+  gsize src_row, dst_row, src_col;
 
-  for (row = 0 ; row < height ; row++) {
+  for (gsize row = 0 ; row < height ; row++) {
     src_row = row * pitch;
     dst_row = row * width;
 
-    for (col = 0 ; col < width ; col++) {
+    for (gsize col = 0 ; col < width ; col++) {
       src_col = col * pixel_size;
 
       dst[dst_row + col] = get_pixel (src_row + src_col + src);
diff --git a/retro-runner/ipc-runner-impl.c b/retro-runner/ipc-runner-impl.c
index 799fdee..db3325c 100644
--- a/retro-runner/ipc-runner-impl.c
+++ b/retro-runner/ipc-runner-impl.c
@@ -457,12 +457,11 @@ variables_set_cb (RetroCore     *core,
                   RetroVariable *variables,
                   IpcRunnerImpl *self)
 {
-  gint i;
   GVariantBuilder* builder;
 
   builder = g_variant_builder_new (G_VARIANT_TYPE ("a(ss)"));
 
-  for (i = 0; variables[i].key && variables[i].value; i++)
+  for (gsize i = 0; variables[i].key && variables[i].value; i++)
     g_variant_builder_add (builder, "(ss)", variables[i].key, variables[i].value);
 
   if (retro_core_get_is_initiated (self->core))
diff --git a/retro-runner/retro-core.c b/retro-runner/retro-core.c
index 3dbc0fa..002618b 100644
--- a/retro-runner/retro-core.c
+++ b/retro-runner/retro-core.c
@@ -820,7 +820,6 @@ load_discs (RetroCore  *self,
 {
   guint length;
   gboolean fullpath;
-  guint index;
   GError *tmp_error = NULL;
 
   set_disk_ejected (self, TRUE, &tmp_error);
@@ -848,7 +847,7 @@ load_discs (RetroCore  *self,
   }
 
   fullpath = get_needs_full_path (self);
-  for (index = 0; index < length; index++) {
+  for (gsize index = 0; index < length; index++) {
     g_autoptr (GFile) file = g_file_new_for_uri (self->media_uris[index]);
     g_autofree gchar *path = g_file_get_path (file);
     g_autoptr (RetroGameInfo) game_info = fullpath ?
diff --git a/retro-runner/retro-environment.c b/retro-runner/retro-environment.c
index a5adccb..1f1072a 100644
--- a/retro-runner/retro-environment.c
+++ b/retro-runner/retro-environment.c
@@ -271,9 +271,9 @@ get_language (RetroCore *self,
   };
 
   const gchar * const *locales = g_get_language_names ();
-  gsize locale_i, language_i = 0;
+  gsize language_i = 0;
 
-  for (locale_i = 0; locales[locale_i] != NULL; locale_i++) {
+  for (gsize locale_i = 0; locales[locale_i] != NULL; locale_i++) {
     for (language_i = 0;
          !g_str_equal (values[language_i].locale, "C") &&
          !g_str_equal (locales[locale_i], values[language_i].locale);
@@ -582,9 +582,7 @@ static gboolean
 set_variables (RetroCore     *self,
                RetroVariable *variable_array)
 {
-  int i;
-
-  for (i = 0 ; variable_array[i].key && variable_array[i].value ; i++) {
+  for (gsize i = 0 ; variable_array[i].key && variable_array[i].value ; i++) {
     retro_debug ("Set variable %s: %s", variable_array[i].key, variable_array[i].value);
 
     retro_core_insert_variable (self, &variable_array[i]);
diff --git a/retro-runner/retro-gl-renderer.c b/retro-runner/retro-gl-renderer.c
index 5362e77..1bc12c1 100644
--- a/retro-runner/retro-gl-renderer.c
+++ b/retro-runner/retro-gl-renderer.c
@@ -173,12 +173,9 @@ retro_gl_renderer_snapshot (RetroRenderer    *renderer,
 
   check_gl_errors ("snapshot");
 
-  if (self->callback->bottom_left_origin) {
-    gsize i;
-
-    for (i = 0; i < size; i += rowstride)
+  if (self->callback->bottom_left_origin)
+    for (gsize i = 0; i < size; i += rowstride)
       memcpy (&data[i], &self->buf_flip[size - i - rowstride], rowstride);
-  }
 
   eglSwapBuffers (self->display, self->context);
 }
diff --git a/tests/retro-reftest-file.c b/tests/retro-reftest-file.c
index 8ee6235..1b5ba1b 100644
--- a/tests/retro-reftest-file.c
+++ b/tests/retro-reftest-file.c
@@ -362,7 +362,6 @@ retro_reftest_file_get_core (RetroReftestFile  *self,
   gchar **key_file_medias;
   gsize key_file_medias_length = 0;
   gchar **media_uris;
-  gint i;
   GFile *media_file;
   GError *tmp_error = NULL;
 
@@ -400,7 +399,7 @@ retro_reftest_file_get_core (RetroReftestFile  *self,
   }
 
   media_uris = g_new0 (gchar *, key_file_medias_length + 1);
-  for (i = 0; i < key_file_medias_length; i++) {
+  for (gsize i = 0; i < key_file_medias_length; i++) {
     media_file = get_sibling (self, key_file_medias[i]);
     media_uris[i] = g_file_get_uri (media_file);
     g_object_unref (media_file);
@@ -424,7 +423,7 @@ retro_reftest_file_get_options (RetroReftestFile  *self,
                                 GError           **error)
 {
   gchar **keys, **values;
-  gsize i, keys_length = 0;
+  gsize keys_length = 0;
   GHashTable *options;
   GError *tmp_error = NULL;
 
@@ -439,7 +438,7 @@ retro_reftest_file_get_options (RetroReftestFile  *self,
   }
 
   options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_strfreev);
-  for (i = 0; i < keys_length; i++) {
+  for (gsize i = 0; i < keys_length; i++) {
     values = g_key_file_get_string_list (self->key_file,
                                          RETRO_REFTEST_FILE_OPTIONS_GROUP,
                                          keys[i],
@@ -468,7 +467,6 @@ retro_reftest_file_get_controllers (RetroReftestFile  *self,
 {
   gboolean has_controllers;
   gchar **controller_names;
-  gsize i;
   GArray *controllers;
   RetroControllerType type;
   GError *tmp_error = NULL;
@@ -499,7 +497,7 @@ retro_reftest_file_get_controllers (RetroReftestFile  *self,
 
   controllers = g_array_sized_new (TRUE, TRUE, sizeof (RetroTestController *), *length);
   g_array_set_clear_func (controllers, (GDestroyNotify) g_object_pointer_unref);
-  for (i = 0; controller_names[i] != NULL; i++) {
+  for (gsize i = 0; controller_names[i] != NULL; i++) {
     if (g_str_equal (controller_names[i], "Joypad"))
       type = RETRO_CONTROLLER_TYPE_JOYPAD;
     else
@@ -515,7 +513,7 @@ retro_reftest_file_get_controllers (RetroReftestFile  *self,
 GList *
 retro_reftest_file_get_frames (RetroReftestFile *self)
 {
-  gsize i, groups_length = 0;
+  gsize groups_length = 0;
   gchar **groups;
   gchar *frame_number_string;
   guint frame_number;
@@ -531,7 +529,7 @@ retro_reftest_file_get_frames (RetroReftestFile *self)
 
   groups = g_key_file_get_groups (self->key_file, &groups_length);
 
-  for (i = 0; i < groups_length; i++) {
+  for (gsize i = 0; i < groups_length; i++) {
     if (!g_str_has_prefix (groups[i], RETRO_REFTEST_FILE_FRAME_GROUP_PREFIX))
       continue;
 
@@ -630,8 +628,8 @@ retro_reftest_file_get_controller_states (RetroReftestFile  *self,
 {
   GHashTable *controllers;
   gchar *group;
-  gchar **keys, **key_i;
-  gchar **inputs, **input_i;
+  gchar **keys;
+  gchar **inputs;
   guint *controller_number;
   gchar *controller_number_string;
   RetroControllerState *state;
@@ -648,7 +646,7 @@ retro_reftest_file_get_controller_states (RetroReftestFile  *self,
 
   controllers = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, (GDestroyNotify) g_array_unref);
 
-  for (key_i = keys; *key_i != NULL; key_i++) {
+  for (GStrv key_i = keys; *key_i != NULL; key_i++) {
     if (!g_str_has_prefix (*key_i, RETRO_REFTEST_FILE_FRAME_CONTROLLER_PREFIX))
       continue;
 
@@ -666,7 +664,7 @@ retro_reftest_file_get_controller_states (RetroReftestFile  *self,
     inputs = g_key_file_get_string_list (self->key_file, group, *key_i, NULL, &tmp_error);
     states = g_array_new (TRUE, TRUE, sizeof (RetroControllerState *));
     g_array_set_clear_func (states, (GDestroyNotify) g_pointer_free);
-    for (input_i = inputs; *input_i != NULL; input_i++) {
+    for (GStrv input_i = inputs; *input_i != NULL; input_i++) {
       state = state_from_string (*input_i);
       if (state == NULL) {
         g_critical ("Invalid controller input: %s. Skipping.", *input_i);
diff --git a/tests/retro-reftest.c b/tests/retro-reftest.c
index e813839..33c4511 100644
--- a/tests/retro-reftest.c
+++ b/tests/retro-reftest.c
@@ -206,7 +206,7 @@ pixdata_equal (GdkPixbuf  *test,
   if (memcmp (gdk_pixbuf_get_pixels (test),
               gdk_pixbuf_get_pixels (ref),
               gdk_pixbuf_get_byte_length (test)) != 0) {
-    gint x, y, width, height, n_channels, rowstride;
+    gint width, height, n_channels, rowstride;
     const guchar *test_pixels, *ref_pixels;
 
     rowstride = gdk_pixbuf_get_rowstride (test);
@@ -220,23 +220,23 @@ pixdata_equal (GdkPixbuf  *test,
     g_assert_cmpint (height, >=, 0);
     g_assert_cmpint (n_channels, >=, 0);
 
-    for (y = 0; y < height; y++) {
-      for (x = 0; x < width; x++) {
+    for (gsize y = 0; y < height; y++) {
+      for (gsize x = 0; x < width; x++) {
         if (memcmp (&test_pixels[x * n_channels], &ref_pixels[x * n_channels], n_channels) != 0) {
           if (n_channels == 4) {
-            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data at %ux%u is #%02X%02X%02X%02X, but should 
be #%02X%02X%02X%02X",
+            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data at %"G_GSIZE_FORMAT"x%"G_GSIZE_FORMAT" is 
#%02X%02X%02X%02X, but should be #%02X%02X%02X%02X",
                          x, y,
                          test_pixels[x * n_channels + 0], test_pixels[x * n_channels + 1], test_pixels[x * 
n_channels + 2], test_pixels[x * n_channels + 3],
                          ref_pixels[x * n_channels + 0], ref_pixels[x * n_channels + 1], ref_pixels[x * 
n_channels + 2], ref_pixels[x * n_channels + 3]);
           }
           else if (n_channels == 3) {
-            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data at %ux%u is #%02X%02X%02X, but should be 
#%02X%02X%02X",
+            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data at %"G_GSIZE_FORMAT"x%"G_GSIZE_FORMAT" is 
#%02X%02X%02X, but should be #%02X%02X%02X",
                          x, y,
                          test_pixels[x * n_channels + 0], test_pixels[x * n_channels + 1], test_pixels[x * 
n_channels + 2],
                          ref_pixels[x * n_channels + 0], ref_pixels[x * n_channels + 1], ref_pixels[x * 
n_channels + 2]);
           }
           else
-            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data differ at %ux%u", x, y);
+            g_set_error (error, GDK_PIXBUF_ERROR, 0, "Image data differ at 
%"G_GSIZE_FORMAT"x%"G_GSIZE_FORMAT, x, y);
 
           return FALSE;
         }
@@ -359,7 +359,6 @@ retro_reftest_test_run (RetroReftestRun *run)
   GHashTableIter iter;
   guint *controller_i;
   GArray *states;
-  gsize state_i;
   RetroControllerState *state;
   RetroTestController *controller;
 
@@ -379,8 +378,7 @@ retro_reftest_test_run (RetroReftestRun *run)
         continue;
 
       retro_test_controller_reset (controller);
-      state_i = 0;
-      for (state_i = 0;
+      for (gsize state_i = 0;
            (state = g_array_index (states, RetroControllerState *, state_i)) != NULL;
            state_i++) {
 
@@ -623,7 +621,7 @@ static void
 retro_reftest_setup_for_file (GFile *file)
 {
   RetroReftestFile *reftest_file;
-  GList *frames, *frame;
+  GList *frames;
   guint current_frame_number, frame_number;
   gboolean has_test;
   RetroReftestData *data;
@@ -670,7 +668,7 @@ retro_reftest_setup_for_file (GFile *file)
 
   frames = retro_reftest_file_get_frames (reftest_file);
   current_frame_number = 0;
-  for (frame = frames; frame != NULL; frame = frame->next) {
+  for (GList *frame = frames; frame != NULL; frame = frame->next) {
     frame_number = *((guint *) frame->data);
 
     /* FastForward */
@@ -705,14 +703,13 @@ main (int argc,
       gchar **argv)
 {
   GFile *file;
-  gint i;
 
   g_setenv ("GDK_RENDERING", "image", FALSE);
 
   if (!parse_command_line (&argc, &argv))
     return 1;
 
-  for (i = 1; i < argc; i++) {
+  for (gsize i = 1; i < argc; i++) {
     file = g_file_new_for_commandline_arg (argv[i]);
     retro_reftest_setup_for_file (file);
     g_object_unref (file);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]