declare variable outside for

1 files changed, 13 insertions, 9 deletions

diff --git a/src/load.c b/src/load.c
index 3bdf39e73..64e592a9e 100644
--- a/src/load.c
+++ b/src/load.c
@@ -317,7 +317,8 @@ static int read_rite_debug_record(mrb_state* mrb, uint8_t const *start, size_t i
   irep->debug_info->files = (mrb_irep_debug_info_file**)mrb_malloc(mrb, sizeof(mrb_irep_debug_info*) * irep->debug_info->flen);
   bin += sizeof(uint16_t);
 
-  for (uint16_t f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
+  uint16_t f_idx;
+  for (f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
     mrb_irep_debug_info_file* const file = (mrb_irep_debug_info_file*)mrb_malloc(mrb, sizeof(mrb_irep_debug_info_file));
     irep->debug_info->files[f_idx] = file;
 
@@ -332,20 +333,22 @@ static int read_rite_debug_record(mrb_state* mrb, uint8_t const *start, size_t i
     file->line_entry_count = bin_to_uint32(bin); bin += sizeof(uint32_t);
     file->line_type = bin_to_uint8(bin); bin += sizeof(uint8_t);
     switch(file->line_type) {
-      case mrb_debug_line_ary:
+      case mrb_debug_line_ary: {
         file->line_ary = mrb_malloc(mrb, sizeof(uint16_t) * file->line_entry_count);
-        for(size_t l = 0; l < file->line_entry_count; ++l) {
+        size_t l;
+        for(l = 0; l < file->line_entry_count; ++l) {
           file->line_ary[l] = bin_to_uint16(bin); bin += sizeof(uint16_t);
         }
-        break;
+      } break;
 
-      case mrb_debug_line_flat_map:
+      case mrb_debug_line_flat_map: {
         file->line_flat_map = mrb_malloc(mrb, sizeof(mrb_irep_debug_info_line) * file->line_entry_count);
-        for(size_t l = 0; l < file->line_entry_count; ++l) {
+        size_t l;
+        for(l = 0; l < file->line_entry_count; ++l) {
           file->line_flat_map[l].start_pos = bin_to_uint32(bin); bin += sizeof(uint32_t);
           file->line_flat_map[l].line = bin_to_uint16(bin); bin += sizeof(uint16_t);
         }
-        break;
+      } break;
 
       default: return MRB_DUMP_GENERAL_FAILURE;
     }
@@ -366,20 +369,21 @@ read_rite_section_debug(mrb_state* mrb, const uint8_t* start, size_t sirep)
   uint8_t const* bin = start;
   struct rite_section_debug_header const* header = (struct rite_section_debug_header const*)bin;
   bin += sizeof(struct rite_section_debug_header);
+  uint16_t i;
 
   uint16_t const nirep = bin_to_uint16(header->nirep);
 
   uint16_t const filenames_len = bin_to_uint16(bin);
   mrb_value const filenames = mrb_ary_new_capa(mrb, filenames_len);
   bin += sizeof(uint16_t);
-  for(uint16_t i = 0; i < filenames_len; ++i) {
+  for(i = 0; i < filenames_len; ++i) {
     uint16_t const f_len = bin_to_uint16(bin);
     bin += sizeof(uint16_t);
     mrb_ary_push(mrb, filenames, mrb_symbol_value(mrb_intern2(mrb, (char const*)bin, f_len)));
     bin += f_len;
   }
 
-  for(uint16_t i = sirep; i < (sirep + nirep); ++i) {
+  for(i = sirep; i < (sirep + nirep); ++i) {
     uint32_t len = 0;
     int result = read_rite_debug_record(mrb, bin, i, &len, filenames);
     if (result != MRB_DUMP_OK) { return result; }