From: Dale Weiler <weilercdale@gmail.com>
Date: Sun, 3 Jan 2016 03:30:35 +0000 (-0500)
Subject: Merge branch 'master' into cleanup
X-Git-Tag: xonotic-v0.8.2~6
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=1a18ff529420930cb4116484991c2dabe3a70654;hp=ee3c1e43c9e70a856222516ab0f3a8231c1d073f

Merge branch 'master' into cleanup
---

diff --git a/exec.cpp b/exec.cpp
index bfb090c..e76004e 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -629,7 +629,7 @@ static qcvm_parameter *main_params = nullptr;
     if (prog->argc != (num)) {                                                 \
         prog->vmerror++;                                                       \
         fprintf(stderr, "ERROR: invalid number of arguments for %s: %i, expected %i\n", \
-        __FUNCTION__, prog->argc, (num));                                      \
+        __func__, prog->argc, (num));                                      \
         return -1;                                                             \
     }                                                                          \
 } while (0)
diff --git a/parser.cpp b/parser.cpp
index df1715c..51f7e1e 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -2523,8 +2523,7 @@ static bool parse_for_go(parser_t *parser, ast_block *block, ast_expression **ou
             parseerror(parser, "expected for-loop condition");
             goto onerr;
         }
-    }
-    else if (!parser_next(parser)) {
+    } else if (!parser_next(parser)) {
         parseerror(parser, "expected for-loop condition");
         goto onerr;
     }
@@ -2535,7 +2534,6 @@ static bool parse_for_go(parser_t *parser, ast_block *block, ast_expression **ou
         if (!cond)
             goto onerr;
     }
-
     /* move on to incrementor */
     if (parser->tok != ';') {
         parseerror(parser, "expected semicolon after for-loop initializer");
diff --git a/test.cpp b/test.cpp
index 6d783f7..2614c7f 100644
--- a/test.cpp
+++ b/test.cpp
@@ -638,6 +638,8 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
                 const char      *qcflags = nullptr;
                 task_t           task;
 
+                memset(&task, 0, sizeof(task));
+
                 found ++;
                 if (!tmpl) {
                     con_err("error compiling task template: %s\n", files->d_name);