From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 10 Mar 2019 21:51:06 +0000 (+0100)
Subject: codegen: Use default-value to pass element_size to GArray constructor
X-Git-Tag: 0.45.1~87
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f83ecd81d6ede886e1d2573c60da28b993db89e3;p=thirdparty%2Fvala.git

codegen: Use default-value to pass element_size to GArray constructor

Based on patch by Jakub Kaszycki
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 0a46bd9ad..7b34ec7af 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4874,13 +4874,6 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 							carg_map = out_arg_map;
 						}
 
-						// g_array_new: element size
-						if (cl == garray_type && param.name == "element_size") {
-							var csizeof = new CCodeFunctionCall (new CCodeIdentifier ("sizeof"));
-							csizeof.add_argument (new CCodeIdentifier (get_ccode_name (expr.type_reference.get_type_arguments ().get (0))));
-							cexpr = csizeof;
-						}
-
 						if (get_ccode_array_length (param) && param.variable_type is ArrayType) {
 							var array_type = (ArrayType) param.variable_type;
 							for (int dim = 1; dim <= array_type.rank; dim++) {
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 77f471057..15a62a196 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5289,9 +5289,9 @@ namespace GLib {
 		[CCode (cname = "data", array_length_cname = "len", array_length_type = "uint")]
 		public G[] data;
 
-		public Array (bool zero_terminated = true, bool clear = true, ulong element_size = 0);
+		public Array (bool zero_terminated = true, bool clear = true, ulong element_size = sizeof (G));
 		[CCode (cname = "g_array_sized_new")]
-		public Array.sized (bool zero_terminated, bool clear, ulong element_size, uint reserved_size);
+		public Array.sized (bool zero_terminated = true, bool clear = true, ulong element_size = sizeof (G), uint reserved_size = 0);
 		public void append_val (owned G value);
 		public void append_vals (void* data, uint len);
 		public void prepend_val (owned G value);