commit ed79e0d89045f14885543e5790e15dc60bbbb132
author Rich Lane <rlane@bigswitch.com> Tue Mar 26 14:30:31 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Sat Apr 06 15:53:41 2013 -0700
tree 11f51fb39d112acf6a74be5b35000b75ff453d6f
parent 45676ebc1bc1e1af94ea4622e37a8d6dea742375

loci: fix non-generated unused variable warnings

c_gen/c_code_gen.py

diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
index 4aec103..735dc6d 100644
--- a/c_gen/c_code_gen.py
+++ b/c_gen/c_code_gen.py
@@ -1108,8 +1108,10 @@
 static inline void
 of_object_parent_length_update(of_object_t *obj, int delta)
 {
+#ifndef NDEBUG
     int count = 0;
     of_wire_buffer_t *wbuf;  /* For debug asserts only */
+#endif
 
     while (obj != NULL) {
         ASSERT(count++ < _MAX_PARENT_ITERATIONS);
@@ -1117,7 +1119,9 @@
         if (obj->wire_length_set != NULL) {
             obj->wire_length_set(obj, obj->length);
         }
+#ifndef NDEBUG
         wbuf = obj->wire_object.wbuf;
+#endif
 
         /* Asserts for wire length checking */
         ASSERT(obj->length + obj->wire_object.obj_offset <=

c_gen/templates/of_type_maps.c

diff --git a/c_gen/templates/of_type_maps.c b/c_gen/templates/of_type_maps.c
index ef1df37..f1fab57 100644
--- a/c_gen/templates/of_type_maps.c
+++ b/c_gen/templates/of_type_maps.c
@@ -50,8 +50,7 @@
 void
 of_object_message_wire_length_get(of_object_t *obj, int *bytes)
 {
-    of_wire_buffer_t *wbuf = OF_OBJECT_TO_WBUF(obj);
-    ASSERT(wbuf != NULL);
+    ASSERT(OF_OBJECT_TO_WBUF(obj) != NULL);
     // ASSERT(obj is message)
     *bytes = of_message_length_get(OF_OBJECT_TO_MESSAGE(obj));
 }
@@ -65,9 +64,7 @@
 void
 of_object_message_wire_length_set(of_object_t *obj, int bytes)
 {
-    of_wire_buffer_t *wbuf = OF_OBJECT_TO_WBUF(obj);
-    ASSERT(wbuf != NULL);
-
+    ASSERT(OF_OBJECT_TO_WBUF(obj) != NULL);
     // ASSERT(obj is message)
     of_message_length_set(OF_OBJECT_TO_MESSAGE(obj), bytes);
 }