]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Revert "codegen: g_free is already NULL-safe"
authorRico Tzschichholz <ricotz@ubuntu.com>
Mon, 16 Jan 2017 14:52:41 +0000 (15:52 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Mon, 16 Jan 2017 14:53:19 +0000 (15:53 +0100)
This reverts commit 5b024e44077b6738855b6b2e92d913b75fda3444.

https://bugzilla.gnome.org/show_bug.cgi?id=777242

codegen/valaccodebasemodule.vala

index 1b9856c48a981bfd5a0fd6f516d72d5fe15eb6e6..9a046908b5d8869efb6e208e3a9d139dcecf0b3c 100644 (file)
@@ -3074,10 +3074,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        var freeid = (CCodeIdentifier) element_destroy_func_expression;
                        string free0_func = "_%s0_".printf (freeid.name);
 
-                       // g_free is already NULL-safe
-                       if (freeid.name == "g_free") {
-                               free0_func = freeid.name;
-                       } else if (add_wrapper (free0_func)) {
+                       if (add_wrapper (free0_func)) {
                                var function = new CCodeFunction (free0_func, "void");
                                function.modifiers = CCodeModifiers.STATIC;
 
@@ -3355,10 +3352,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        var freeid = (CCodeIdentifier) ccall.call;
                        string free0_func = "_%s0".printf (freeid.name);
 
-                       // g_free is already NULL-safe
-                       if (freeid.name == "g_free") {
-                               free0_func = freeid.name;
-                       } else if (add_wrapper (free0_func)) {
+                       if (add_wrapper (free0_func)) {
                                var macro = destroy_value (new GLibValue (type, new CCodeIdentifier ("var"), true), true);
                                cfile.add_type_declaration (new CCodeMacroReplacement.with_expression ("%s(var)".printf (free0_func), macro));
                        }