Conform to C89/C90 variable declaration rules.
While we are C99 in general, the Ruby build system
for building C extensions enables several flags that
throw warnings for C89/C90 variable ordering rules.
To avoid spewing a million warnings (or trying to
specifically override these warnings with command-line
flags, which would be tricky and possibly fragile)
we conform to Ruby's world of C89/C90.
Change-Id: I0e03e62d95068dfdfde112df0fb16a248a2f32a0
diff --git a/ruby/ext/google/protobuf_c/map.c b/ruby/ext/google/protobuf_c/map.c
index 3436e09..5043f39 100644
--- a/ruby/ext/google/protobuf_c/map.c
+++ b/ruby/ext/google/protobuf_c/map.c
@@ -167,9 +167,9 @@
VALUE Map_alloc(VALUE klass) {
Map* self = ALLOC(Map);
+ VALUE ret = TypedData_Wrap_Struct(klass, &Map_type, self);
memset(self, 0, sizeof(Map));
self->value_type_class = Qnil;
- VALUE ret = TypedData_Wrap_Struct(klass, &Map_type, self);
return ret;
}
@@ -215,6 +215,7 @@
*/
VALUE Map_init(int argc, VALUE* argv, VALUE _self) {
Map* self = ruby_to_Map(_self);
+ int init_value_arg;
// We take either two args (:key_type, :value_type), three args (:key_type,
// :value_type, "ValueMessageType"), or four args (the above plus an initial
@@ -241,7 +242,7 @@
rb_raise(rb_eArgError, "Invalid key type for map.");
}
- int init_value_arg = 2;
+ init_value_arg = 2;
if (needs_typeclass(self->value_type) && argc > 2) {
self->value_type_class = argv[2];
validate_type_class(self->value_type, self->value_type_class);
@@ -356,9 +357,9 @@
char keybuf[TABLE_KEY_BUF_LENGTH];
const char* keyval = NULL;
size_t length = 0;
+ upb_value v;
table_key(self, key, keybuf, &keyval, &length);
- upb_value v;
if (upb_strtable_lookup2(&self->table, keyval, length, &v)) {
void* mem = value_memory(&v);
return native_slot_get(self->value_type, self->value_type_class, mem);
@@ -381,10 +382,11 @@
char keybuf[TABLE_KEY_BUF_LENGTH];
const char* keyval = NULL;
size_t length = 0;
+ upb_value v;
+ void* mem;
table_key(self, key, keybuf, &keyval, &length);
- upb_value v;
- void* mem = value_memory(&v);
+ mem = value_memory(&v);
native_slot_set(self->value_type, self->value_type_class, mem, value);
// Replace any existing value by issuing a 'remove' operation first.
@@ -432,9 +434,9 @@
char keybuf[TABLE_KEY_BUF_LENGTH];
const char* keyval = NULL;
size_t length = 0;
+ upb_value v;
table_key(self, key, keybuf, &keyval, &length);
- upb_value v;
if (upb_strtable_remove2(&self->table, keyval, length, &v)) {
void* mem = value_memory(&v);
return native_slot_get(self->value_type, self->value_type_class, mem);
@@ -564,6 +566,8 @@
*/
VALUE Map_eq(VALUE _self, VALUE _other) {
Map* self = ruby_to_Map(_self);
+ Map* other;
+ upb_strtable_iter it;
// Allow comparisons to Ruby hashmaps by converting to a temporary Map
// instance. Slow, but workable.
@@ -573,7 +577,7 @@
_other = other_map;
}
- Map* other = ruby_to_Map(_other);
+ other = ruby_to_Map(_other);
if (self == other) {
return Qtrue;
@@ -589,7 +593,6 @@
// For each member of self, check that an equal member exists at the same key
// in other.
- upb_strtable_iter it;
for (upb_strtable_begin(&it, &self->table);
!upb_strtable_done(&it);
upb_strtable_next(&it)) {
@@ -719,6 +722,7 @@
Map* self = ruby_to_Map(_self);
Map* other = ruby_to_Map(hashmap);
+ upb_strtable_iter it;
if (self->key_type != other->key_type ||
self->value_type != other->value_type ||
@@ -726,19 +730,19 @@
rb_raise(rb_eArgError, "Attempt to merge Map with mismatching types");
}
- upb_strtable_iter it;
for (upb_strtable_begin(&it, &other->table);
!upb_strtable_done(&it);
upb_strtable_next(&it)) {
// Replace any existing value by issuing a 'remove' operation first.
+ upb_value v;
upb_value oldv;
upb_strtable_remove2(&self->table,
upb_strtable_iter_key(&it),
upb_strtable_iter_keylength(&it),
&oldv);
- upb_value v = upb_strtable_iter_value(&it);
+ v = upb_strtable_iter_value(&it);
upb_strtable_insert2(&self->table,
upb_strtable_iter_key(&it),
upb_strtable_iter_keylength(&it),
