Merge branch 'master' into test-suite

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index d057b3674de077e97623f3422604f57d394fd00d..b483db9880d1dd4b4de6a19f2515e5aee3c6f4af 100644 (file)
--- a/main.c
+++ b/main.c
@@ -46,7 +46,7 @@ const oper_info *operators      = NULL;
 size_t           operator_count = 0;
 
 typedef struct { char *filename; int type; } argitem;
-VECTOR_MAKE(argitem, items);
+static argitem *items = NULL;
 
 #define TYPE_QC  0
 #define TYPE_ASM 1
@@ -224,6 +224,8 @@ static bool options_parse(int argc, char **argv) {
             if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) {
                 continue;
             }
+            
+            con_change(redirout, redirerr);
 
             if (!strcmp(argv[0]+1, "debug")) {
                 opts_debug = true;
@@ -341,7 +343,7 @@ static bool options_parse(int argc, char **argv) {
                         return false;
                     }
                     item.filename = argarg;
-                    items_add(item);
+                    vec_push(items, item);
                     break;
 
                 case '-':
@@ -378,10 +380,9 @@ static bool options_parse(int argc, char **argv) {
             argitem item;
             item.filename = argv[0];
             item.type     = TYPE_QC;
-            items_add(item);
+            vec_push(items, item);
         }
     }
-    con_change(redirout, redirerr);
     return true;
 }
 
@@ -471,18 +472,18 @@ int main(int argc, char **argv) {
 
     util_debug("COM", "starting ...\n");
 
-    if (items_elements) {
+    if (vec_size(items)) {
         con_out("Mode: manual\n");
-        con_out("There are %lu items to compile:\n", (unsigned long)items_elements);
-        for (itr = 0; itr < items_elements; ++itr) {
+        con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
+        for (itr = 0; itr < vec_size(items); ++itr) {
             con_out("  item: %s (%s)\n",
-                   items_data[itr].filename,
-                   ( (items_data[itr].type == TYPE_QC ? "qc" :
-                     (items_data[itr].type == TYPE_ASM ? "asm" :
-                     (items_data[itr].type == TYPE_SRC ? "progs.src" :
+                   items[itr].filename,
+                   ( (items[itr].type == TYPE_QC ? "qc" :
+                     (items[itr].type == TYPE_ASM ? "asm" :
+                     (items[itr].type == TYPE_SRC ? "progs.src" :
                      ("unknown"))))));
 
-            if (!parser_compile_file(items_data[itr].filename))
+            if (!parser_compile_file(items[itr].filename))
             {
                     retval = 1;
                     goto cleanup;
@@ -541,7 +542,7 @@ srcdone:
 cleanup:
     util_debug("COM", "cleaning ...\n");
     con_close();
-    mem_d(items_data);
+    vec_free(items);
 
     parser_cleanup();
     if (opts_output_free)