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 6e026b43b0225c61a888ef2c7b520949bf541dc6..a2e7254b7ac903dc51cedf0cb80ca258fb11fd25 100644 (file)
--- 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 51dc999c019a65235f5d4c6a75d19ccf971f4bae..3e5c4b484b98b86bb44674f30cb6ca775dd665bd 100644 (file)
--- 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 43755a96aacdee8b18ff68187cd1cdd0ad01351e..08d87742e3aefc3e2c2a5a96bc35ce0bf18a7667 100644 (file)
--- 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 e97083b1d457f32d0b3e564045c18050757e45f2..8aef3be7256fa4091913f92253ab23b9bea588aa 100644 (file)
--- 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 d172777617c95b5564192293dc8afaf75eef4d1a..c9673ab4a6d189593f2484a234f7d4282d421fae 100644 (file)
--- 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 7300d7cae4269867f0480cbc4d30e6b192f91b58..73df6b27ea886e13737ce78f1780c51bda59532b 100644 (file)
--- 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 0e7b921d9c58f620c381bffca573a335d5f07535..a7aeb72c174e79c1e346c20681664470ad15026a 100644 (file)
--- 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 36ff156789f65682510e5f2cf284ca0bb840666c..d82de992c24ae98fb665e7b39946780dc3a7e7e0 100644 (file)
--- 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 33ef02671e11fef5a2459effe841ac26b7dce61a..23e4b7c81d852a5b4c5a6ae7e40c1d7499253684 100644 (file)
--- 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 049b02190b5c2dca945aff3b4bf5b1a2e848c883..7e1877d471b615eb2c0ce3dcfc8b1fd474bb4781 100644 (file)
--- 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 45d31816f56c7aa7f09a64d6f04f479531a257f6..4fcb4eb877c3dc758c665861b72e033ce2fa20f3 100644 (file)
--- 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 143c5ceb8fb452fcd0b267eb9d95f714c1a174e9..8a9c048c134d40d15b1851dabc70f302d0783e64 100644 (file)
--- 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 44755af0ecee9be2ccb8bcc99a2c5d0ad27d73db..82c5e19ae3532db037a0efb1ac7d740eb3758e7a 100644 (file)
--- 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 4d9dbabeb49cf78080d432da2ef9079f6c6188e9..5bcf368298ff2d3358a1555296e5045e9bff58bd 100644 (file)
--- 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 ca3384d61f6e85937833a3e4abf3fcf0c34a437a..9974ed63c3c3af93524a714d823561609927fd13 100644 (file)
--- 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 9ee6b85a68e04bd579ff2f8ed9d1623ed98b6d7f..0831aa88589e0754b33c4d8fdb6d734d0aacd7d4 100644 (file)
--- 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 332e8a3cbb753a0867c7cedef48fd2e266a550bf..99598aaeda1cf528f35bc45d536da0f4ceae6959 100644 (file)
--- 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 b109dfa752b61b7ee0fdfe11959c55912b9fea1b..2c03b2532fb2f230d7f89e1507b7f04d33e4507d 100644 (file)
--- 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 fc0c97f8579fa4409ff0aec4d249f2341c69d749..96299500173bce6fe720e2c41d88c029fc1f4980 100644 (file)
--- 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 235871a4e4f0292eaccfed44997a6e928bb5f4c0..41c33ea8529781c78cdbbcc074e9d0a68f7862e3 100644 (file)
--- 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 cf2ff0a6749121c6300ce6f43add6531168b7a2c..55585c18107dd5a9da65949a693ed9ae93680b45 100644 (file)
--- 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 470b0938319156ec001f104f5cba0fbb66be151d..989551a7f597435f99ee80560ecaef004c0995bf 100644 (file)
--- 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 478fdde6939102bbd3cbe1387b20047a9520e3e9..2f7795a86ddbbf86fad9e4c657677163afb1b911 100644 (file)
--- 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 879d30ba3c73b554b3327039c4de4d9d52ccaf0a..a7095eba3597c6d8b8e7211552cda8162760d5dc 100644 (file)
--- 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 2b383a8bbf48b7850f975fef9aec5bffffe73b3a..5f53e86e6caac8140e8f3473311aeccec95b383e 100644 (file)
--- 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 4bf528bcbdc6ea680f1f64edbbec18acaa721fb4..4257e336a58a36dc63c8948e512c52bef96c35c6 100644 (file)
--- 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 02a44ef618a18ee65e61be3d19d0941a3d5f64b5..9b3aff152761fe2e0eba14e3f85ebb8f5e5d89c3 100644 (file)
--- 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 c568f8a3dafee2065c59241a1351e7821a2065ea..8d11968ace40524983420a80ffe416fc682796b1 100644 (file)
--- 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 8c054bc709f2aeff558cbe46730f08e2e07793a4..2939d2d5a263db54c4134a1cc095299da6de6f78 100644 (file)
--- 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 4ff425818a5be281f095402b1f3aaccf0f46b198..f44e0d3dfb6f9a1dd8a38fa0c0e8d74babca0d2a 100644 (file)
--- 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 e351a8c9d41b302580847bfc8c8c0853cc1ba33d..d47351d21baabdf481431e021d57aecdeeca3474 100644 (file)
--- 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 a6101aa232aaa1e90f086ca3545007ebfe109f08..dfb17b9a0beaa6f1d8060a3f6f9f60a188c37441 100644 (file)
--- 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 97e0ee978db3dacdceec22f6405766c8b881dcbd..524d81e75c0bcb45d37d262282a2eeffd9b5f7b2 100644 (file)
--- 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 5bd5a735f2d0401ca0e538275960d9ac833ace39..abefbc0e06fb63dafd9327e1428557e01e864c19 100644 (file)
--- 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 eb48d5b42823351b7eb889d17c7c659245171f6d..11e5a0e675684bb718e128faa67ad4460f6fdf88 100644 (file)
--- 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 0817ac8fdb2b6c903b12817fb67d542b8c3636c0..757b763ce54b0553ee60c01ee08314c266e070b4 100644 (file)
--- 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 8fbe86a04ca9fdd149c5f75734b12ebccf7627da..12fef1bcdd2077f280382464c80bef93285ad810 100644 (file)
--- 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 a17cb729aa86852e5ca578445491879683c76a70..061658ba00244aaa6d087a706e12c404f1979fd1 100644 (file)
--- 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 c6718224165575b5856a28d2de01df6fa532f456..22731b3c335296f3078436b017a5e3aded097bde 100644 (file)
--- 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 817e564e314482613b4b36ad808614805ea6c97c..be387f8f65be824b9e313e0b9a874597defd112b 100644 (file)
--- 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 f52e753d4e72e9977481e4062c6df86b0ffbe4d9..9e6b7849f68a392e9a11445c8807828322b4468d 100644 (file)
--- 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 de9a7ccca3edb64a6a95fab7fd86c5125ddf6e16..567b653efa9625398c3e3822124eb526355ede31 100644 (file)
--- 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 5e463327f9633288871d8d082f3ce8b2ac76e400..ffa62b7b8ad3305a0855f1a39ad2e16c3054f700 100644 (file)
--- 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;
 }