From: Juerg Billeter <j@bitron.ch>
Date: Sat, 3 Nov 2007 22:00:11 +0000 (+0000)
Subject: avoid void pointer arithmetic in _vala_array_move
X-Git-Tag: VALA_0_1_5~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fd6b40c44b3bb6482f75ffde5286a8b96d473db;p=thirdparty%2Fvala.git

avoid void pointer arithmetic in _vala_array_move

2007-11-03  Juerg Billeter  <j@bitron.ch>

	* gobject/valaccodegeneratorsourcefile.vala: avoid void pointer
	  arithmetic in _vala_array_move

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

diff --git a/ChangeLog b/ChangeLog
index d226b29cb..14508d46e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-03  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodegeneratorsourcefile.vala: avoid void pointer
+	  arithmetic in _vala_array_move
+
 2007-11-03  Jürg Billeter  <j@bitron.ch>
 
 	* gobject-introspection/gen-introspect.c: fix generated properties, from
diff --git a/gobject/valaccodegeneratorsourcefile.vala b/gobject/valaccodegeneratorsourcefile.vala
index a410da3cd..e55152de3 100644
--- a/gobject/valaccodegeneratorsourcefile.vala
+++ b/gobject/valaccodegeneratorsourcefile.vala
@@ -118,14 +118,14 @@ public class Vala.CCodeGenerator {
 		fun.block.add_statement (new CCodeExpressionStatement (ccall));
 
 		var czero1 = new CCodeFunctionCall (new CCodeIdentifier ("memset"));
-		czero1.add_argument (src_address);
+		czero1.add_argument (new CCodeCastExpression (src_address, "char *"));
 		czero1.add_argument (new CCodeConstant ("0"));
 		czero1.add_argument (new CCodeBinaryExpression (CCodeBinaryOperator.MUL, new CCodeParenthesizedExpression (new CCodeBinaryExpression (CCodeBinaryOperator.MINUS, dest, src)), element_size));
 		var czeroblock1 = new CCodeBlock ();
 		czeroblock1.add_statement (new CCodeExpressionStatement (czero1));
 
 		var czero2 = new CCodeFunctionCall (new CCodeIdentifier ("memset"));
-		czero2.add_argument (dest_end_address);
+		czero2.add_argument (new CCodeCastExpression (dest_end_address, "char *"));
 		czero2.add_argument (new CCodeConstant ("0"));
 		czero2.add_argument (new CCodeBinaryExpression (CCodeBinaryOperator.MUL, new CCodeParenthesizedExpression (new CCodeBinaryExpression (CCodeBinaryOperator.MINUS, src, dest)), element_size));
 		var czeroblock2 = new CCodeBlock ();