Changes in tools/mkarray.py [211fd68:81c6365] in mainline

File:

• tools/mkarray.py (modified) (6 diffs)

tools/mkarray.py

@@ -39 +39 @@
 def usage(prname):
         "Print usage syntax"
-        print("%s [--deflate] <DESTINATION> <TYPENAME> <LABEL> <AS_PROLOG> <SECTION> [SOURCE ...]" % prname)
+        print("%s [--deflate] <DESTINATION> <LABEL> <AS_PROLOG> <SECTION> [SOURCE ...]" % prname)
 
 def arg_check():
-        if (len(sys.argv) < 6):
+        if (len(sys.argv) < 5):
                 usage(sys.argv[0])
                 sys.exit()
@@ -66 +66 @@
 
         dest = sys.argv[1]
-        typename = sys.argv[2]
-        label = sys.argv[3]
-        as_prolog = sys.argv[4]
-        section = sys.argv[5]
+        label = sys.argv[2]
+        as_prolog = sys.argv[3]
+        section = sys.argv[4]
 
         timestamp = (1980, 1, 1, 0, 0, 0)
@@ -82 +81 @@
         archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
 
-        for src in sys.argv[6:]:
+        for src in sys.argv[5:]:
                 basename = os.path.basename(src)
                 plainname = os.path.splitext(basename)[0]
@@ -148 +147 @@
         data += "#include <stdbool.h>\n\n"
         data += "#define %sS  %u\n\n" % (label.upper(), src_cnt)
-        data += "#ifndef %sS_T_\n" % typename.upper()
-        data += "#define %sS_T_\n\n" % typename.upper()
         data += "typedef struct {\n"
         data += "\tconst char *name;\n"
@@ -156 +153 @@
         data += "\tsize_t inflated;\n"
         data += "\tbool compressed;\n"
-        data += "} %s_t;\n\n" % typename
-        data += "#endif\n"
-        data += "extern %s_t %ss[];\n\n" % (typename, label)
+        data += "} %s_t;\n\n" % label
+        data += "extern %s_t %ss[];\n\n" % (label, label)
         data += "\n".join(header_ctx)
         data += "\n\n"
@@ -183 +179 @@
         data += ' */\n\n'
         data += "#include \"%s.h\"\n\n" % dest
-        data += "%s_t %ss[] = {\n" % (typename, label)
+        data += "%s_t %ss[] = {\n" % (label, label)
         data += ",\n".join(desc_ctx)
         data += "\n"