[vala/staging: 1/2] Revert "codegen: g_free is already NULL-safe"
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging: 1/2] Revert "codegen: g_free is already NULL-safe"
- Date: Mon, 16 Jan 2017 14:59:28 +0000 (UTC)
commit 0d3ed86477736bdf12ef32c69fc5050b18a0d1ed
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Jan 16 15:52:41 2017 +0100
Revert "codegen: g_free is already NULL-safe"
This reverts commit 5b024e44077b6738855b6b2e92d913b75fda3444.
https://bugzilla.gnome.org/show_bug.cgi?id=777242
codegen/valaccodebasemodule.vala | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 1b9856c..9a04690 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -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));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]