From: Jürg Billeter <j@bitron.ch>
Date: Sat, 25 Oct 2008 21:38:22 +0000 (+0000)
Subject: Support custom sentinels for constructors
X-Git-Tag: VALA_0_5_1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fbdefa9d6c439904cb0cc559ff9f924bc577341;p=thirdparty%2Fvala.git

Support custom sentinels for constructors

2008-10-25  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodegenerator.vala:

	Support custom sentinels for constructors

svn path=/trunk/; revision=1929
---

diff --git a/ChangeLog b/ChangeLog
index 89a747ff1..3cfbdd923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-25  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodegenerator.vala:
+
+	Support custom sentinels for constructors
+
 2008-10-25  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valadelegate.vala:
diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index ad1774dc8..584799636 100644
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -3303,8 +3303,11 @@ public class Vala.CCodeGenerator : CodeGenerator {
 			}
 
 			if (ellipsis) {
-				// ensure variable argument list ends with NULL
-				creation_call.add_argument (new CCodeConstant ("NULL"));
+				/* ensure variable argument list ends with NULL
+				 * except when using printf-style arguments */
+				if (!m.printf_format && m.sentinel != "") {
+					creation_call.add_argument (new CCodeConstant (m.sentinel));
+				}
 			}
 
 			creation_expr = creation_call;