From: Corentin Noël Date: Wed, 12 Nov 2025 22:49:01 +0000 (+0100) Subject: gdbus: Avoid unused variables in method call and properties getter/setter X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=80402a7adc048397bb8384a06e9cc6013e5a1c2e;p=thirdparty%2Fvala.git gdbus: Avoid unused variables in method call and properties getter/setter As some methods and properties are filtered, do only declare the instance property if it is actually going to be used. Avoids `variable ‘object’ set but not used' warnings. --- diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala index 6e026b43b..a2e7254b7 100644 --- a/codegen/valagdbusservermodule.vala +++ b/codegen/valagdbusservermodule.vala @@ -719,9 +719,6 @@ public class Vala.GDBusServerModule : GDBusClientModule { push_function (cfunc); - ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); - ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); - bool first = true; foreach (Method m in sym.get_methods ()) { @@ -733,6 +730,11 @@ public class Vala.GDBusServerModule : GDBusClientModule { continue; } + if (first) { + ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); + ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); + } + cfile.add_include ("string.h"); var ccheck = new CCodeFunctionCall (new CCodeIdentifier ("strcmp")); @@ -787,10 +789,6 @@ public class Vala.GDBusServerModule : GDBusClientModule { push_function (cfunc); - ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); - - ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); - bool firstif = true; foreach (Property prop in sym.get_properties ()) { @@ -805,6 +803,11 @@ public class Vala.GDBusServerModule : GDBusClientModule { continue; } + if (firstif) { + ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); + ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); + } + cfile.add_include ("string.h"); var ccheck = new CCodeFunctionCall (new CCodeIdentifier ("strcmp")); @@ -851,10 +854,6 @@ public class Vala.GDBusServerModule : GDBusClientModule { push_function (cfunc); - ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); - - ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); - bool firstif = true; foreach (Property prop in sym.get_properties ()) { @@ -869,6 +868,11 @@ public class Vala.GDBusServerModule : GDBusClientModule { continue; } + if (firstif) { + ccode.add_declaration ("gpointer*", new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data"))); + ccode.add_declaration ("gpointer", new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")))); + } + cfile.add_include ("string.h"); var ccheck = new CCodeFunctionCall (new CCodeIdentifier ("strcmp")); diff --git a/tests/dbus/async-bus_client.c-expected b/tests/dbus/async-bus_client.c-expected index 51dc999c0..3e5c4b484 100644 --- a/tests/dbus/async-bus_client.c-expected +++ b/tests/dbus/async-bus_client.c-expected @@ -278,10 +278,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -295,10 +291,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-bus_server.c-expected b/tests/dbus/async-bus_server.c-expected index 43755a96a..08d87742e 100644 --- a/tests/dbus/async-bus_server.c-expected +++ b/tests/dbus/async-bus_server.c-expected @@ -239,10 +239,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -256,10 +252,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-connection_client.c-expected b/tests/dbus/async-connection_client.c-expected index e97083b1d..8aef3be72 100644 --- a/tests/dbus/async-connection_client.c-expected +++ b/tests/dbus/async-connection_client.c-expected @@ -278,10 +278,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -295,10 +291,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-connection_server.c-expected b/tests/dbus/async-connection_server.c-expected index d17277761..c9673ab4a 100644 --- a/tests/dbus/async-connection_server.c-expected +++ b/tests/dbus/async-connection_server.c-expected @@ -239,10 +239,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -256,10 +252,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-errors_client.c-expected b/tests/dbus/async-errors_client.c-expected index 7300d7cae..73df6b27e 100644 --- a/tests/dbus/async-errors_client.c-expected +++ b/tests/dbus/async-errors_client.c-expected @@ -868,10 +868,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -885,10 +881,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-errors_server.c-expected b/tests/dbus/async-errors_server.c-expected index 0e7b921d9..a7aeb72c1 100644 --- a/tests/dbus/async-errors_server.c-expected +++ b/tests/dbus/async-errors_server.c-expected @@ -885,10 +885,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -902,10 +898,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-no-reply_client.c-expected b/tests/dbus/async-no-reply_client.c-expected index 36ff15678..d82de992c 100644 --- a/tests/dbus/async-no-reply_client.c-expected +++ b/tests/dbus/async-no-reply_client.c-expected @@ -631,10 +631,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -648,10 +644,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async-no-reply_server.c-expected b/tests/dbus/async-no-reply_server.c-expected index 33ef02671..23e4b7c81 100644 --- a/tests/dbus/async-no-reply_server.c-expected +++ b/tests/dbus/async-no-reply_server.c-expected @@ -577,10 +577,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -594,10 +590,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async_client.c-expected b/tests/dbus/async_client.c-expected index 049b02190..7e1877d47 100644 --- a/tests/dbus/async_client.c-expected +++ b/tests/dbus/async_client.c-expected @@ -733,10 +733,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -750,10 +746,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/async_server.c-expected b/tests/dbus/async_server.c-expected index 45d31816f..4fcb4eb87 100644 --- a/tests/dbus/async_server.c-expected +++ b/tests/dbus/async_server.c-expected @@ -700,10 +700,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -717,10 +713,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug596862.c-expected b/tests/dbus/bug596862.c-expected index 143c5ceb8..8a9c048c1 100644 --- a/tests/dbus/bug596862.c-expected +++ b/tests/dbus/bug596862.c-expected @@ -216,10 +216,6 @@ foo_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -233,10 +229,6 @@ foo_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug602003_client.c-expected b/tests/dbus/bug602003_client.c-expected index 44755af0e..82c5e19ae 100644 --- a/tests/dbus/bug602003_client.c-expected +++ b/tests/dbus/bug602003_client.c-expected @@ -277,10 +277,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -294,10 +290,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug602003_server.c-expected b/tests/dbus/bug602003_server.c-expected index 4d9dbabeb..5bcf36829 100644 --- a/tests/dbus/bug602003_server.c-expected +++ b/tests/dbus/bug602003_server.c-expected @@ -272,10 +272,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -289,10 +285,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug735437_client.c-expected b/tests/dbus/bug735437_client.c-expected index ca3384d61..9974ed63c 100644 --- a/tests/dbus/bug735437_client.c-expected +++ b/tests/dbus/bug735437_client.c-expected @@ -642,10 +642,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -659,10 +655,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug735437_server.c-expected b/tests/dbus/bug735437_server.c-expected index 9ee6b85a6..0831aa885 100644 --- a/tests/dbus/bug735437_server.c-expected +++ b/tests/dbus/bug735437_server.c-expected @@ -457,10 +457,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -474,10 +470,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug782719_client.c-expected b/tests/dbus/bug782719_client.c-expected index 332e8a3cb..99598aaed 100644 --- a/tests/dbus/bug782719_client.c-expected +++ b/tests/dbus/bug782719_client.c-expected @@ -322,10 +322,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -339,10 +335,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug782719_server.c-expected b/tests/dbus/bug782719_server.c-expected index b109dfa75..2c03b2532 100644 --- a/tests/dbus/bug782719_server.c-expected +++ b/tests/dbus/bug782719_server.c-expected @@ -341,10 +341,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -358,10 +354,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug783002_client.c-expected b/tests/dbus/bug783002_client.c-expected index fc0c97f85..962995001 100644 --- a/tests/dbus/bug783002_client.c-expected +++ b/tests/dbus/bug783002_client.c-expected @@ -435,10 +435,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -452,10 +448,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected index 235871a4e..41c33ea85 100644 --- a/tests/dbus/bug783002_server.c-expected +++ b/tests/dbus/bug783002_server.c-expected @@ -488,10 +488,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -505,10 +501,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/bug792277.c-expected b/tests/dbus/bug792277.c-expected index cf2ff0a67..55585c181 100644 --- a/tests/dbus/bug792277.c-expected +++ b/tests/dbus/bug792277.c-expected @@ -443,10 +443,6 @@ ifoo_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -460,10 +456,6 @@ ifoo_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } @@ -648,10 +640,6 @@ foo_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -665,10 +653,6 @@ foo_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/connection_client.c-expected b/tests/dbus/connection_client.c-expected index 470b09383..989551a7f 100644 --- a/tests/dbus/connection_client.c-expected +++ b/tests/dbus/connection_client.c-expected @@ -269,10 +269,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -286,10 +282,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/connection_server.c-expected b/tests/dbus/connection_server.c-expected index 478fdde69..2f7795a86 100644 --- a/tests/dbus/connection_server.c-expected +++ b/tests/dbus/connection_server.c-expected @@ -239,10 +239,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -256,10 +252,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/dicts_client.c-expected b/tests/dbus/dicts_client.c-expected index 879d30ba3..a7095eba3 100644 --- a/tests/dbus/dicts_client.c-expected +++ b/tests/dbus/dicts_client.c-expected @@ -300,10 +300,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -317,10 +313,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/dicts_server.c-expected b/tests/dbus/dicts_server.c-expected index 2b383a8bb..5f53e86e6 100644 --- a/tests/dbus/dicts_server.c-expected +++ b/tests/dbus/dicts_server.c-expected @@ -407,10 +407,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -424,10 +420,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } @@ -648,10 +640,6 @@ test_interface_bar_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -665,10 +653,6 @@ test_interface_bar_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected index 4bf528bcb..4257e336a 100644 --- a/tests/dbus/dynamic-method_server.c-expected +++ b/tests/dbus/dynamic-method_server.c-expected @@ -265,10 +265,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -282,10 +278,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/enum-string-marshalling.c-expected b/tests/dbus/enum-string-marshalling.c-expected index 02a44ef61..9b3aff152 100644 --- a/tests/dbus/enum-string-marshalling.c-expected +++ b/tests/dbus/enum-string-marshalling.c-expected @@ -832,10 +832,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -849,10 +845,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected index c568f8a3d..8d11968ac 100644 --- a/tests/dbus/errors_client.c-expected +++ b/tests/dbus/errors_client.c-expected @@ -662,10 +662,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -679,10 +675,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected index 8c054bc70..2939d2d5a 100644 --- a/tests/dbus/errors_server.c-expected +++ b/tests/dbus/errors_server.c-expected @@ -497,10 +497,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -514,10 +510,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor-async_client.c-expected b/tests/dbus/filedescriptor-async_client.c-expected index 4ff425818..f44e0d3df 100644 --- a/tests/dbus/filedescriptor-async_client.c-expected +++ b/tests/dbus/filedescriptor-async_client.c-expected @@ -490,10 +490,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -507,10 +503,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor-async_server.c-expected b/tests/dbus/filedescriptor-async_server.c-expected index e351a8c9d..d47351d21 100644 --- a/tests/dbus/filedescriptor-async_server.c-expected +++ b/tests/dbus/filedescriptor-async_server.c-expected @@ -519,10 +519,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -536,10 +532,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor-errors_client.c-expected b/tests/dbus/filedescriptor-errors_client.c-expected index a6101aa23..dfb17b9a0 100644 --- a/tests/dbus/filedescriptor-errors_client.c-expected +++ b/tests/dbus/filedescriptor-errors_client.c-expected @@ -308,10 +308,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -325,10 +321,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor-errors_server.c-expected b/tests/dbus/filedescriptor-errors_server.c-expected index 97e0ee978..524d81e75 100644 --- a/tests/dbus/filedescriptor-errors_server.c-expected +++ b/tests/dbus/filedescriptor-errors_server.c-expected @@ -289,10 +289,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -306,10 +302,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor_client.c-expected b/tests/dbus/filedescriptor_client.c-expected index 5bd5a735f..abefbc0e0 100644 --- a/tests/dbus/filedescriptor_client.c-expected +++ b/tests/dbus/filedescriptor_client.c-expected @@ -340,10 +340,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -357,10 +353,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected index eb48d5b42..11e5a0e67 100644 --- a/tests/dbus/filedescriptor_server.c-expected +++ b/tests/dbus/filedescriptor_server.c-expected @@ -389,10 +389,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -406,10 +402,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/generics_client.c-expected b/tests/dbus/generics_client.c-expected index 0817ac8fd..757b763ce 100644 --- a/tests/dbus/generics_client.c-expected +++ b/tests/dbus/generics_client.c-expected @@ -276,10 +276,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -293,10 +289,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/generics_server.c-expected b/tests/dbus/generics_server.c-expected index 8fbe86a04..12fef1bcd 100644 --- a/tests/dbus/generics_server.c-expected +++ b/tests/dbus/generics_server.c-expected @@ -250,10 +250,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -267,10 +263,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/interface-info_client.c-expected b/tests/dbus/interface-info_client.c-expected index a17cb729a..061658ba0 100644 --- a/tests/dbus/interface-info_client.c-expected +++ b/tests/dbus/interface-info_client.c-expected @@ -196,10 +196,6 @@ test_dbus_interface_method_call (GDBusConnection* connection, GDBusMethodInvocation* invocation, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; g_object_unref (invocation); } @@ -212,10 +208,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -229,10 +221,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/interface-info_server.c-expected b/tests/dbus/interface-info_server.c-expected index c67182241..22731b3c3 100644 --- a/tests/dbus/interface-info_server.c-expected +++ b/tests/dbus/interface-info_server.c-expected @@ -185,10 +185,6 @@ test_dbus_interface_method_call (GDBusConnection* connection, GDBusMethodInvocation* invocation, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; g_object_unref (invocation); } @@ -201,10 +197,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -218,10 +210,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected index 817e564e3..be387f8f6 100644 --- a/tests/dbus/no-reply_client.c-expected +++ b/tests/dbus/no-reply_client.c-expected @@ -559,10 +559,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -576,10 +572,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/no-reply_server.c-expected b/tests/dbus/no-reply_server.c-expected index f52e753d4..9e6b7849f 100644 --- a/tests/dbus/no-reply_server.c-expected +++ b/tests/dbus/no-reply_server.c-expected @@ -438,10 +438,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -455,10 +451,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/signals_client.c-expected b/tests/dbus/signals_client.c-expected index de9a7ccca..567b653ef 100644 --- a/tests/dbus/signals_client.c-expected +++ b/tests/dbus/signals_client.c-expected @@ -530,10 +530,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -547,10 +543,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; } diff --git a/tests/dbus/signals_server.c-expected b/tests/dbus/signals_server.c-expected index 5e463327f..ffa62b7b8 100644 --- a/tests/dbus/signals_server.c-expected +++ b/tests/dbus/signals_server.c-expected @@ -376,10 +376,6 @@ test_dbus_interface_get_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return NULL; } @@ -393,10 +389,6 @@ test_dbus_interface_set_property (GDBusConnection* connection, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; return FALSE; }