[vala/staging] codegen: Avoid symbol clashes with "va_*" from "stdarg.h"
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] codegen: Avoid symbol clashes with "va_*" from "stdarg.h"
- Date: Wed, 11 Mar 2020 09:20:18 +0000 (UTC)
commit a5c3c6c635978933641a1edd45aa5adfc5a10c24
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Wed Mar 11 10:06:39 2020 +0100
codegen: Avoid symbol clashes with "va_*" from "stdarg.h"
Make a better choice for naming the local variables in
CCodeArrayModule.append_params_array()
In addition to 98ab3da89640b8b8a6c67044b4df1194672774bb
Fixes https://gitlab.gnome.org/GNOME/vala/issues/923
codegen/valaccodearraymodule.vala | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala
index 8fa9e1c18..c90bae49b 100644
--- a/codegen/valaccodearraymodule.vala
+++ b/codegen/valaccodearraymodule.vala
@@ -858,17 +858,17 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
cfile.add_include ("stdarg.h");
}
ccode.add_declaration ("va_list", new CCodeVariableDeclarator ("_va_list_%s".printf
(get_ccode_name (local))));
- var va_start = new CCodeFunctionCall (new CCodeIdentifier ("va_start"));
- va_start.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
- va_start.add_argument (new CCodeIdentifier ("_first_%s".printf (get_ccode_name (local))));
- ccode.add_expression (va_start);
+ var vastart = new CCodeFunctionCall (new CCodeIdentifier ("va_start"));
+ vastart.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
+ vastart.add_argument (new CCodeIdentifier ("_first_%s".printf (get_ccode_name (local))));
+ ccode.add_expression (vastart);
ccode.add_assignment (get_local_cexpression (element), new CCodeIdentifier
("_first_%s".printf (get_ccode_name (local))));
ccode.open_while (new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY,
get_local_cexpression (element), new CCodeConstant ("NULL")));
- var va_arg = new CCodeFunctionCall (new CCodeIdentifier ("va_arg"));
- va_arg.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
- va_arg.add_argument (new CCodeIdentifier (get_ccode_name (array_type.element_type)));
+ var vaarg = new CCodeFunctionCall (new CCodeIdentifier ("va_arg"));
+ vaarg.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
+ vaarg.add_argument (new CCodeIdentifier (get_ccode_name (array_type.element_type)));
var ccall = new CCodeFunctionCall (new CCodeIdentifier (generate_array_add_wrapper
(array_type)));
ccall.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF,
get_local_cexpression (local)));
@@ -877,12 +877,12 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
ccall.add_argument (get_local_cexpression (element));
ccode.add_expression (ccall);
- ccode.add_assignment (get_local_cexpression (element), va_arg);
+ ccode.add_assignment (get_local_cexpression (element), vaarg);
ccode.close ();
- var va_end = new CCodeFunctionCall (new CCodeIdentifier ("va_end"));
- va_end.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
- ccode.add_expression (va_end);
+ var vaend = new CCodeFunctionCall (new CCodeIdentifier ("va_end"));
+ vaend.add_argument (new CCodeIdentifier ("_va_list_%s".printf (get_ccode_name (local))));
+ ccode.add_expression (vaend);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]