Declare counter var inside loop

We require c99/gnu99 anyways.

src/tools/autocomplete.c

@@ -171,8 +171,7 @@ autocomplete_add(Autocomplete ac, const char* item)
 void
 autocomplete_add_all(Autocomplete ac, char** items)
 {
-    int i = 0;
-    for (i = 0; i < g_strv_length(items); i++) {
+    for (int i = 0; i < g_strv_length(items); i++) {
         autocomplete_add(ac, items[i]);
     }
 }
@@ -202,8 +201,7 @@ autocomplete_remove(Autocomplete ac, const char* const item)
 void
 autocomplete_remove_all(Autocomplete ac, char** items)
 {
-    int i = 0;
-    for (i = 0; i < g_strv_length(items); i++) {
+    for (int i = 0; i < g_strv_length(items); i++) {
         autocomplete_remove(ac, items[i]);
     }
 }
@@ -310,10 +308,9 @@ autocomplete_param_with_func(const char* const input, char* command, autocomplet
     int len = strlen(command_cpy);
 
     if (strncmp(input, command_cpy, len) == 0) {
-        int i;
         int inp_len = strlen(input);
         char prefix[inp_len];
-        for (i = len; i < inp_len; i++) {
+        for (int i = len; i < inp_len; i++) {
             prefix[i - len] = input[i];
         }
         prefix[inp_len - len] = '\0';
@@ -341,9 +338,8 @@ autocomplete_param_with_ac(const char* const input, char* command, Autocomplete
     int len = strlen(command_cpy);
     int inp_len = strlen(input);
     if (strncmp(input, command_cpy, len) == 0) {
-        int i;
         char prefix[inp_len];
-        for (i = len; i < inp_len; i++) {
+        for (int i = len; i < inp_len; i++) {
             prefix[i - len] = input[i];
         }
         prefix[inp_len - len] = '\0';

src/tools/parser.c

@@ -62,8 +62,7 @@ _parse_args_helper(const char* const inp, int min, int max, gboolean* result, gb
     GSList* tokens = NULL;
 
     // add tokens to GSList
-    int i;
-    for (i = 0; i < inp_size; i++) {
+    for (int i = 0; i < inp_size; i++) {
         gchar* curr_ch = g_utf8_offset_to_pointer(copy, i);
         gunichar curr_uni = g_utf8_get_char(curr_ch);
 
@@ -255,12 +254,11 @@ count_tokens(const char* const string)
     int length = g_utf8_strlen(string, -1);
     gboolean in_quotes = FALSE;
     int num_tokens = 0;
-    int i = 0;
 
     // include first token
     num_tokens++;
 
-    for (i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
         gchar* curr_ch = g_utf8_offset_to_pointer(string, i);
         gunichar curr_uni = g_utf8_get_char(curr_ch);
 
@@ -288,12 +286,11 @@ get_start(const char* const string, int tokens)
     gboolean in_quotes = FALSE;
     char* result_str = NULL;
     int num_tokens = 0;
-    int i = 0;
 
     // include first token
     num_tokens++;
 
-    for (i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
         gchar* curr_ch = g_utf8_offset_to_pointer(string, i);
         gunichar curr_uni = g_utf8_get_char(curr_ch);
 
@@ -327,8 +324,7 @@ GHashTable*
 parse_options(gchar** args, gchar** opt_keys, gboolean* res)
 {
     GList* keys = NULL;
-    int i;
-    for (i = 0; i < g_strv_length(opt_keys); i++) {
+    for (int i = 0; i < g_strv_length(opt_keys); i++) {
         keys = g_list_append(keys, opt_keys[i]);
     }
 
@@ -343,9 +339,8 @@ parse_options(gchar** args, gchar** opt_keys, gboolean* res)
     }
 
     // validate options
-    int curr;
     GList* found_keys = NULL;
-    for (curr = 0; curr < g_strv_length(args); curr += 2) {
+    for (int curr = 0; curr < g_strv_length(args); curr += 2) {
         // check if option valid
         if (g_list_find_custom(keys, args[curr], (GCompareFunc)g_strcmp0) == NULL) {
             *res = FALSE;
@@ -378,7 +373,7 @@ parse_options(gchar** args, gchar** opt_keys, gboolean* res)
     // create map
     options = g_hash_table_new(g_str_hash, g_str_equal);
     *res = TRUE;
-    for (curr = 0; curr < g_strv_length(args); curr += 2) {
+    for (int curr = 0; curr < g_strv_length(args); curr += 2) {
         g_hash_table_insert(options, args[curr], args[curr + 1]);
     }