From 0030147305c41d289d924b003fa67977c2dea6ff Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Fri, 30 Mar 2012 10:55:34 +0100 Subject: [PATCH 2/3] RHEL 5: build: Fix some C99-isms that confuse old gcc. --- generator/generator.ml | 3 ++- lib/hivex.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/generator/generator.ml b/generator/generator.ml index b0c10eb..ed152af 100755 --- a/generator/generator.ml +++ b/generator/generator.ml @@ -1885,7 +1885,8 @@ static void raise_closed (const char *) Noreturn; pr " free (r);\n" | RStringList -> pr " rv = caml_copy_string_array ((const char **) r);\n"; - pr " for (int i = 0; r[i] != NULL; ++i) free (r[i]);\n"; + pr " int i;\n"; + pr " for (i = 0; r[i] != NULL; ++i) free (r[i]);\n"; pr " free (r);\n" | RLenType -> pr " rv = copy_type_len (len, t);\n" | RLenValue -> pr " rv = copy_len_value (len, r);\n" diff --git a/lib/hivex.c b/lib/hivex.c index df313bf..711b058 100644 --- a/lib/hivex.c +++ b/lib/hivex.c @@ -2819,7 +2819,8 @@ hivex_node_set_value (hive_h *h, hive_node_h node, int retval = -1; size_t nr_values = 0; - for (hive_value_h *itr = prev_values; *itr != 0; ++itr) + hive_value_h *itr; + for (itr = prev_values; *itr != 0; ++itr) ++nr_values; hive_set_value *values = malloc ((nr_values + 1) * (sizeof (hive_set_value))); @@ -2874,8 +2875,9 @@ hivex_node_set_value (hive_h *h, hive_node_h node, retval = hivex_node_set_values (h, node, nr_values, values, 0); - leave_partial: - for (int i = 0; i < alloc_ct; i += 2) { + leave_partial: ; + int i; + for (i = 0; i < alloc_ct; i += 2) { free (values[i / 2].value); if (i + 1 < alloc_ct && values[i / 2].key != NULL) free (values[i / 2].key); -- 1.7.4.1