Always return the error if any sync method failed

It seems we could rely on the structure being zeroed by coincidence, which fails sometimes.

4 files changed, 38 insertions, 0 deletions

diff --git a/lib/colord/cd-client-sync.c b/lib/colord/cd-client-sync.c
index 3ca0d8b..fc76c6b 100644
--- a/lib/colord/cd-client-sync.c
+++ b/lib/colord/cd-client-sync.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -82,6 +83,7 @@ cd_client_connect_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -132,6 +134,7 @@ cd_client_delete_profile_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -182,6 +185,7 @@ cd_client_delete_device_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -234,6 +238,7 @@ cd_client_find_profile_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.profile = NULL;
@@ -288,6 +293,7 @@ cd_client_find_profile_by_filename_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.profile = NULL;
@@ -347,6 +353,7 @@ cd_client_create_profile_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.profile = NULL;
@@ -461,6 +468,7 @@ cd_client_create_device_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.device = NULL;
@@ -515,6 +523,7 @@ cd_client_get_devices_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.array = NULL;
@@ -568,6 +577,7 @@ cd_client_get_profiles_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.array = NULL;
@@ -621,6 +631,7 @@ cd_client_get_sensors_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.array = NULL;
@@ -675,6 +686,7 @@ cd_client_find_device_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -730,6 +742,7 @@ cd_client_find_device_by_property_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -783,6 +796,7 @@ cd_client_get_standard_space_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 	helper.profile = NULL;
@@ -838,6 +852,7 @@ cd_client_get_devices_by_kind_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -893,6 +908,7 @@ cd_client_find_profile_by_property_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -946,6 +962,7 @@ cd_client_find_sensor_sync (CdClient *client,
 	CdClientHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdClientHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
diff --git a/lib/colord/cd-device-sync.c b/lib/colord/cd-device-sync.c
index 664f2cb..1607667 100644
--- a/lib/colord/cd-device-sync.c
+++ b/lib/colord/cd-device-sync.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -81,6 +82,7 @@ cd_device_connect_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -136,6 +138,7 @@ cd_device_set_property_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -191,6 +194,7 @@ cd_device_add_profile_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -244,6 +248,7 @@ cd_device_remove_profile_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -297,6 +302,7 @@ cd_device_get_profile_for_qualifiers_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -350,6 +356,7 @@ cd_device_make_profile_default_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -402,6 +409,7 @@ cd_device_profiling_inhibit_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -454,6 +462,7 @@ cd_device_profiling_uninhibit_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -507,6 +516,7 @@ cd_device_get_profile_relation_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -560,6 +570,7 @@ cd_device_set_enabled_sync (CdDevice *device,
 	CdDeviceHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdDeviceHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
diff --git a/lib/colord/cd-profile-sync.c b/lib/colord/cd-profile-sync.c
index 72f915b..d0748b1 100644
--- a/lib/colord/cd-profile-sync.c
+++ b/lib/colord/cd-profile-sync.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -79,6 +80,7 @@ cd_profile_connect_sync (CdProfile *profile,
 	CdProfileHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdProfileHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -134,6 +136,7 @@ cd_profile_set_property_sync (CdProfile *profile,
 	CdProfileHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdProfileHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -185,6 +188,7 @@ cd_profile_install_system_wide_sync (CdProfile *profile,
 	CdProfileHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdProfileHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
diff --git a/lib/colord/cd-sensor-sync.c b/lib/colord/cd-sensor-sync.c
index d254ca5..beec3f2 100644
--- a/lib/colord/cd-sensor-sync.c
+++ b/lib/colord/cd-sensor-sync.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -79,6 +80,7 @@ cd_sensor_connect_sync (CdSensor *sensor,
 	CdSensorHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdSensorHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -130,6 +132,7 @@ cd_sensor_lock_sync (CdSensor *sensor,
 	CdSensorHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdSensorHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -181,6 +184,7 @@ cd_sensor_unlock_sync (CdSensor *sensor,
 	CdSensorHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdSensorHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -234,6 +238,7 @@ cd_sensor_set_options_sync (CdSensor *sensor,
 	CdSensorHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdSensorHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;
 
@@ -287,6 +292,7 @@ cd_sensor_get_sample_sync (CdSensor *sensor,
 	CdSensorHelper helper;
 
 	/* create temp object */
+	memset (&helper, 0, sizeof (CdSensorHelper));
 	helper.loop = g_main_loop_new (NULL, FALSE);
 	helper.error = error;