From: Dale Weiler <killfieldengine@gmail.com>
Date: Wed, 24 Apr 2013 01:46:53 +0000 (+0000)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~19
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=dc8523c6503e014a463df42520b48f597c7655be;hp=-c

Merge branch 'master' into cooking
---

dc8523c6503e014a463df42520b48f597c7655be
diff --combined parser.c
index 66c3726,c50eb17..836f6ca
mode 100644,100755..100755
--- a/parser.c
+++ b/parser.c
@@@ -257,10 -257,10 +257,10 @@@ static ast_value* parser_const_string(p
  {
      size_t hash = util_hthash(parser->ht_imm_string, str);
      ast_value *out;
-     if ( (out = util_htgeth(parser->ht_imm_string, str, hash)) ) {
+     if ( (out = (ast_value*)util_htgeth(parser->ht_imm_string, str, hash)) ) {
          if (dotranslate && out->name[0] == '#') {
              char name[32];
-             snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(parser->translated++));
+             util_snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(parser->translated++));
              ast_value_set_name(out, name);
          }
          return out;
@@@ -273,7 -273,7 +273,7 @@@
      */
      if (dotranslate) {
          char name[32];
-         snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(parser->translated++));
+         util_snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(parser->translated++));
          out = ast_value_new(parser_ctx(parser), name, TYPE_STRING);
      } else
          out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING);
@@@ -4227,13 -4227,13 +4227,13 @@@ static bool parse_function_body(parser_
          varargs->expression.flags |= AST_FLAG_IS_VARARG;
          varargs->expression.next = (ast_expression*)ast_value_new(ast_ctx(var), NULL, TYPE_VECTOR);
          varargs->expression.count = 0;
-         snprintf(name, sizeof(name), "%s##va##SET", var->name);
+         util_snprintf(name, sizeof(name), "%s##va##SET", var->name);
          if (!parser_create_array_setter_proto(parser, varargs, name)) {
              ast_delete(varargs);
              ast_block_delete(block);
              goto enderrfn;
          }
-         snprintf(name, sizeof(name), "%s##va##GET", var->name);
+         util_snprintf(name, sizeof(name), "%s##va##GET", var->name);
          if (!parser_create_array_getter_proto(parser, varargs, varargs->expression.next, name)) {
              ast_delete(varargs);
              ast_block_delete(block);
@@@ -5114,7 -5114,7 +5114,7 @@@ static bool parse_variable(parser_t *pa
      bool      cleanvar  = true;
      bool      wasarray  = false;
  
 -    ast_member *me[3];
 +    ast_member *me[3] = { NULL, NULL, NULL };
  
      if (!localblock && is_static)
          parseerror(parser, "`static` qualifier is not supported in global scope");
@@@ -5533,10 -5533,10 +5533,10 @@@
           */
          if (var->expression.vtype == TYPE_ARRAY) {
              char name[1024];
-             snprintf(name, sizeof(name), "%s##SET", var->name);
+             util_snprintf(name, sizeof(name), "%s##SET", var->name);
              if (!parser_create_array_setter(parser, var, name))
                  goto cleanup;
-             snprintf(name, sizeof(name), "%s##GET", var->name);
+             util_snprintf(name, sizeof(name), "%s##GET", var->name);
              if (!parser_create_array_getter(parser, var, var->expression.next, name))
                  goto cleanup;
          }
@@@ -5554,14 -5554,14 +5554,14 @@@
                  goto cleanup;
              }
  
-             snprintf(name, sizeof(name), "%s##SETF", var->name);
+             util_snprintf(name, sizeof(name), "%s##SETF", var->name);
              if (!parser_create_array_field_setter(parser, array, name))
                  goto cleanup;
  
              telem = ast_type_copy(ast_ctx(var), array->expression.next);
              tfield = ast_value_new(ast_ctx(var), "<.type>", TYPE_FIELD);
              tfield->expression.next = telem;
-             snprintf(name, sizeof(name), "%s##GETFP", var->name);
+             util_snprintf(name, sizeof(name), "%s##GETFP", var->name);
              if (!parser_create_array_getter(parser, array, (ast_expression*)tfield, name)) {
                  ast_delete(tfield);
                  goto cleanup;