api: enforce vla is last and fixed string type

[vpp.git] / src / vpp-api / vapi / vapi_c_gen.py

diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py
index 9939bc0..b9b9aa7 100755 (executable)
--- a/src/vpp-api/vapi/vapi_c_gen.py
+++ b/src/vpp-api/vapi/vapi_c_gen.py
@@ -10,13 +10,19 @@ from vapi_json_parser import Field, Struct, Enum, Union, Message, JsonParser,\
 
 class CField(Field):
     def get_c_name(self):
-        return self.name
+        return "vapi_type_%s" % self.name
 
     def get_c_def(self):
-        if self.len is not None:
-            return "%s %s[%d];" % (self.type.get_c_name(), self.name, self.len)
+        if self.type.get_c_name() == 'vl_api_string_t':
+            if self.len:
+                return "u8 %s[%d];" % (self.name, self.len)
+            else:
+                return "vl_api_string_t %s;" % (self.name)
         else:
-            return "%s %s;" % (self.type.get_c_name(), self.name)
+            if self.len is not None:
+                return "%s %s[%d];" % (self.type.get_c_name(), self.name, self.len)
+            else:
+                return "%s %s;" % (self.type.get_c_name(), self.name)
 
     def get_swap_to_be_code(self, struct, var):
         if self.len is not None:
@@ -100,16 +106,15 @@ class CField(Field):
 
 class CAlias(CField):
     def get_c_name(self):
-        return self.name
+        return "vapi_type_%s" % self.name
 
     def get_c_def(self):
-        return "typedef %s" % super(CAlias, self).get_c_def()
-        # if self.len is not None:
-        #     return "typedef %s %s[%d];" % (self.type.get_c_name(), self.name, self.len)
-        # else:
-        #     return "typedef %s %s;" % (self.type.get_c_name(), self.name)
-
-    # def needs_byte_swap
+        if self.len is not None:
+            return "typedef %s vapi_type_%s[%d];" % (
+                self.type.get_c_name(), self.name, self.len)
+        else:
+            return "typedef %s vapi_type_%s;" % (
+                self.type.get_c_name(), self.name)
 
 
 class CStruct(Struct):