Don't perform pointer arithmetic on void pointers, patch by Tai Chi Minh

2008-07-02  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodegeneratorsourcefile.vala:

	Don't perform pointer arithmetic on void pointers,
	patch by Tai Chi Minh Ralph Eastwood

svn path=/trunk/; revision=1671

diff --git a/ChangeLog b/ChangeLog
index 4a5f9ac2da1c058525980733485257b2f87a9a8f..74ab2e5e7450a113e5a2dc4338c58d0f37863fd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-02  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodegeneratorsourcefile.vala:
+
+       Don't perform pointer arithmetic on void pointers,
+       patch by Tai Chi Minh Ralph Eastwood
+
 2008-07-02  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gio-2.0/:

diff --git a/THANKS b/THANKS
index db96ecacecc8d32333e212f680b9b9a1239442cc..cf40291f950f7386a56b90395ee857536e9d6405 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -46,6 +46,7 @@ Roland Hostettler
 Ross Burton
 Samuel Cormier-Iijima
 Stéphan Kochen
+Tai Chi Minh Ralph Eastwood
 Thijs Vermeir
 Travis Watkins
 Vlad Grecescu

diff --git a/gobject/valaccodegeneratorsourcefile.vala b/gobject/valaccodegeneratorsourcefile.vala
index c77d4951041f5ae13fd6361f78a2a866991b290c..423bc02ed20e469a037202c1bfeb16012ee3f547 100644 (file)
--- a/gobject/valaccodegeneratorsourcefile.vala
+++ b/gobject/valaccodegeneratorsourcefile.vala
@@ -100,7 +100,7 @@ public class Vala.CCodeGenerator {
                fun.add_parameter (new CCodeFormalParameter ("length", "gint"));
                source_type_member_declaration.append (fun.copy ());
 
-               var array = new CCodeIdentifier ("array");
+               var array = new CCodeCastExpression (new CCodeIdentifier ("array"), "char*");
                var element_size = new CCodeIdentifier ("element_size");
                var length = new CCodeIdentifier ("length");
                var src = new CCodeIdentifier ("src");
@@ -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 (new CCodeCastExpression (src_address, "char *"));
+               czero1.add_argument (src_address);
                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 (new CCodeCastExpression (dest_end_address, "char *"));
+               czero2.add_argument (dest_end_address);
                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 ();