From 74eeb27ad43d348b5d1c67f3fc0ed79034ae2fc2 Mon Sep 17 00:00:00 2001
From: nirenjan <nirenjan@gmail.com>
Date: Thu, 27 Jul 2017 17:16:20 -0700
Subject: [PATCH] Fix build breakage on Travis-CI

Travis uses an older version of GCC which doesn't seem to support C99
mode by default. This fixes it by moving the variable declarations out
of the for loop and to the beginning of the function.
---
 libusbx52/usb_x52_stub.c            | 14 ++++++++++----
 libusbx52/util/create_device_list.c |  3 ++-
 libusbx52/util/log_actions.c        |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libusbx52/usb_x52_stub.c b/libusbx52/usb_x52_stub.c
index 820cbf4..609bc33 100644
--- a/libusbx52/usb_x52_stub.c
+++ b/libusbx52/usb_x52_stub.c
@@ -22,6 +22,7 @@ int libusb_init(libusb_context **ctx)
     int pid;
     int parsed;
     FILE *dev_list;
+    int i;
 
     /*
      * Technically, libusb_init can be called with a NULL context pointer,
@@ -73,7 +74,7 @@ int libusb_init(libusb_context **ctx)
     /* Rewind and read the file again, but now put them into the device list */
     rewind(dev_list);
 
-    for (int i = 0; i < dev_count && !feof(dev_list); i++) {
+    for (i = 0; i < dev_count && !feof(dev_list); i++) {
         /* Set the base fields */
         tmp_ctx->devices[i].context = tmp_ctx;
         tmp_ctx->devices[i].index = i;
@@ -132,13 +133,14 @@ ssize_t libusb_get_device_list(libusb_context *ctx, libusb_device ***list)
      */
     libusb_device **tmp_list = calloc(ctx->num_devices + 1, sizeof(*tmp_list));
     libusb_device *dev;
+    int i;
 
     if (tmp_list == NULL) {
         return LIBUSB_ERROR_NO_MEM;
     }
 
     /* Initialize the list with pointers to the individual devices */
-    for (int i = 0; i < ctx->num_devices; i++) {
+    for (i = 0; i < ctx->num_devices; i++) {
         dev = &(ctx->devices[i]);
         /* Increment the refcount */
         dev->ref_count += 1;
@@ -151,8 +153,10 @@ ssize_t libusb_get_device_list(libusb_context *ctx, libusb_device ***list)
 
 void libusb_free_device_list(libusb_device **list, int unref_devices)
 {
+    libusb_device **dev;
+
     if (unref_devices) {
-        for (libusb_device **dev = list; *dev; dev++) {
+        for (dev = list; *dev; dev++) {
             /* Decrement the refcount */
             (*dev)->ref_count -= 1;
         }
@@ -233,6 +237,8 @@ int libusb_control_transfer(libusb_device_handle *dev_handle,
                             uint16_t wLength,
                             unsigned int timeout)
 {
+    int i;
+
     /* Always log the control transfer */
     fprintf(dev_handle->packet_data_file,
         "%s: RqType: %02x bRequest: %02x wValue: %04x wIndex: %04x timeout: %d\n",
@@ -240,7 +246,7 @@ int libusb_control_transfer(libusb_device_handle *dev_handle,
     if (data != NULL) {
         fprintf(dev_handle->packet_data_file, "%s: Data[%d]: ", __func__,
                 wLength);
-        for (int i = 0; i < wLength; i++) {
+        for (i = 0; i < wLength; i++) {
             fprintf(dev_handle->packet_data_file, "%02x ", data[i]);
         }
         fprintf(dev_handle->packet_data_file, "\n");
diff --git a/libusbx52/util/create_device_list.c b/libusbx52/util/create_device_list.c
index 502bae0..e2c3591 100644
--- a/libusbx52/util/create_device_list.c
+++ b/libusbx52/util/create_device_list.c
@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
     int vid;
     int pid;
     int parsed;
+    int i;
 
     data = fopen(INPUT_DEVICE_LIST_FILE, "w");
     if (data == NULL) {
@@ -32,7 +33,7 @@ int main(int argc, char *argv[])
     }
 
     /* Process arguments until there are fewer than 2 remaining */
-    for (int i = 1; i < argc && (argc - i) >= 2; i += 2) {
+    for (i = 1; i < argc && (argc - i) >= 2; i += 2) {
         parsed = sscanf(argv[i], "%x", &vid);
         if (parsed != 1) break;
 
diff --git a/libusbx52/util/log_actions.c b/libusbx52/util/log_actions.c
index 4531cf9..f0f07d9 100644
--- a/libusbx52/util/log_actions.c
+++ b/libusbx52/util/log_actions.c
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
     int index;
     int value;
     int parsed;
+    int i;
     libusb_device_handle *hdl;
     libusb_context *ctx;
 
@@ -80,7 +81,7 @@ int main(int argc, char *argv[])
     ctx = hdl->ctx;
 
     /* Process arguments until there are fewer than 2 remaining */
-    for (int i = 1; i < argc && (argc - i) >= 2; i += 2) {
+    for (i = 1; i < argc && (argc - i) >= 2; i += 2) {
         parsed = sscanf(argv[i], "%x", &index);
         if (parsed != 1) break;