trivial: Fix FALSE/NULL confusion spotted with GCC6

17 files changed, 58 insertions, 58 deletions

diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
index 141efb6..a066662 100644
--- a/contrib/session-helper/cd-main.c
+++ b/contrib/session-helper/cd-main.c
@@ -1474,7 +1474,7 @@ cd_main_find_device (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_FAILED_TO_FIND_DEVICE,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 	ret = cd_device_connect_sync (device_tmp,
 				      NULL,
@@ -1484,7 +1484,7 @@ cd_main_find_device (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_FAILED_TO_FIND_DEVICE,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 
 	/* mark device to be profiled in colord */
@@ -1496,7 +1496,7 @@ cd_main_find_device (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_INTERNAL,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 
 	/* success */
@@ -1524,7 +1524,7 @@ cd_main_find_sensor (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 	ret = cd_sensor_connect_sync (sensor_tmp,
 				      NULL,
@@ -1534,7 +1534,7 @@ cd_main_find_sensor (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 
 	/* lock the sensor */
@@ -1546,7 +1546,7 @@ cd_main_find_sensor (CdMainPrivate *priv,
 			     CD_SESSION_ERROR,
 			     CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR,
 			     "%s", error_local->message);
-		return FALSE;
+		return NULL;
 	}
 
 	/* success */
diff --git a/lib/colord/cd-client.c b/lib/colord/cd-client.c
index dd337fd..3210db9 100644
--- a/lib/colord/cd-client.c
+++ b/lib/colord/cd-client.c
@@ -472,7 +472,7 @@ cd_client_create_device_finish (CdClient *client,
 				GAsyncResult *res,
 				GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -615,7 +615,7 @@ cd_client_create_profile_finish (CdClient *client,
 				 GAsyncResult *res,
 				 GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -922,7 +922,7 @@ cd_client_import_profile_finish (CdClient *client,
 				 GAsyncResult *res,
 				 GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1306,7 +1306,7 @@ cd_client_find_device_finish (CdClient *client,
 			      GAsyncResult *res,
 			      GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1397,7 +1397,7 @@ cd_client_find_device_by_property_finish (CdClient *client,
 					  GAsyncResult *res,
 					  GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1490,7 +1490,7 @@ cd_client_find_profile_finish (CdClient *client,
 			       GAsyncResult *res,
 			       GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1581,7 +1581,7 @@ cd_client_find_profile_by_filename_finish (CdClient *client,
 					   GAsyncResult *res,
 					   GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1672,7 +1672,7 @@ cd_client_get_standard_space_finish (CdClient *client,
 				     GAsyncResult *res,
 				     GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1791,7 +1791,7 @@ cd_client_get_devices_finish (CdClient *client,
 			      GAsyncResult *res,
 			      GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1879,7 +1879,7 @@ cd_client_get_devices_by_kind_finish (CdClient *client,
 				      GAsyncResult *res,
 				      GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1998,7 +1998,7 @@ cd_client_get_profiles_finish (CdClient *client,
 			       GAsyncResult *res,
 			       GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -2114,7 +2114,7 @@ cd_client_get_sensors_finish (CdClient *client,
 			      GAsyncResult *res,
 			      GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -2202,7 +2202,7 @@ cd_client_find_profile_by_property_finish (CdClient *client,
 					   GAsyncResult *res,
 					   GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -2295,7 +2295,7 @@ cd_client_find_sensor_finish (CdClient *client,
 			      GAsyncResult *res,
 			      GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, client), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, client), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/lib/colord/cd-device.c b/lib/colord/cd-device.c
index 111b25f..3e7ec67 100644
--- a/lib/colord/cd-device.c
+++ b/lib/colord/cd-device.c
@@ -1498,7 +1498,7 @@ cd_device_get_profile_for_qualifiers_finish (CdDevice *device,
 					     GAsyncResult *res,
 					     GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, device), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, device), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
index 97f684b..1264885 100644
--- a/lib/colord/cd-icc.c
+++ b/lib/colord/cd-icc.c
@@ -1611,7 +1611,7 @@ cd_icc_save_data (CdIcc *icc,
 	guint i;
 	g_autoptr(GList) md_keys = NULL;
 
-	g_return_val_if_fail (CD_IS_ICC (icc), FALSE);
+	g_return_val_if_fail (CD_IS_ICC (icc), NULL);
 
 	/* convert profile kind */
 	for (i = 0; map_profile_kind[i].colord != CD_PROFILE_KIND_LAST; i++) {
diff --git a/lib/colord/cd-it8.c b/lib/colord/cd-it8.c
index 36bfd08..b25fd6d 100644
--- a/lib/colord/cd-it8.c
+++ b/lib/colord/cd-it8.c
@@ -1796,7 +1796,7 @@ cd_it8_get_xyz_for_rgb (CdIt8 *it8, gdouble R, gdouble G, gdouble B, gdouble del
 	guint i;
 	const CdColorRGB *rgb_tmp;
 
-	g_return_val_if_fail (CD_IS_IT8 (it8), FALSE);
+	g_return_val_if_fail (CD_IS_IT8 (it8), NULL);
 
 	for (i = 0; i < priv->array_xyz->len; i++) {
 		rgb_tmp = g_ptr_array_index (priv->array_rgb, i);
diff --git a/lib/colord/cd-sensor.c b/lib/colord/cd-sensor.c
index d0d9fa2..729054c 100644
--- a/lib/colord/cd-sensor.c
+++ b/lib/colord/cd-sensor.c
@@ -996,7 +996,7 @@ cd_sensor_get_sample_finish (CdSensor *sensor,
 			     GAsyncResult *res,
 			     GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -1088,7 +1088,7 @@ cd_sensor_get_spectrum_finish (CdSensor *sensor,
 			       GAsyncResult *res,
 			       GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/lib/colorhug/ch-device.c b/lib/colorhug/ch-device.c
index 52c5d0f..513848c 100644
--- a/lib/colorhug/ch-device.c
+++ b/lib/colorhug/ch-device.c
@@ -2123,7 +2123,7 @@ ch_device_take_reading_xyz (GUsbDevice *device, guint16 calibration_idx,
 			     CH_DEVICE_ERROR,
 			     CH_ERROR_NOT_IMPLEMENTED,
 			     "Getting an XYZ value is not supported");
-	return FALSE;
+	return NULL;
 }
 
 /**
@@ -2165,7 +2165,7 @@ ch_device_get_spectrum (GUsbDevice *device, GCancellable *cancellable, GError **
 				     CH_DEVICE_ERROR,
 				     CH_ERROR_NOT_IMPLEMENTED,
 				     "Getting a spectrum is not supported");
-		return FALSE;
+		return NULL;
 	}
 	for (i = 0; i < 1024 * sizeof(gint32) / CH_EP0_TRANSFER_SIZE; i++) {
 		ret = g_usb_device_control_transfer (device,
diff --git a/lib/huey/huey-ctx.c b/lib/huey/huey-ctx.c
index 1f47cbf..a96eadc 100644
--- a/lib/huey/huey-ctx.c
+++ b/lib/huey/huey-ctx.c
@@ -360,7 +360,7 @@ huey_ctx_take_sample (HueyCtx *ctx, CdSensorCap cap, GError **error)
 				     HUEY_CTX_ERROR,
 				     HUEY_CTX_ERROR_NO_SUPPORT,
 				     "Huey cannot measure in projector mode");
-		return FALSE;
+		return NULL;
 	}
 
 	/* set this to one value for a quick approximate value */
@@ -372,7 +372,7 @@ huey_ctx_take_sample (HueyCtx *ctx, CdSensorCap cap, GError **error)
 					     &color_native,
 					     error);
 	if (!ret)
-		return FALSE;
+		return NULL;
 	g_debug ("initial values: red=%i, green=%i, blue=%i",
 		 color_native.R, color_native.G, color_native.B);
 
@@ -395,7 +395,7 @@ huey_ctx_take_sample (HueyCtx *ctx, CdSensorCap cap, GError **error)
 					     &color_native,
 					     error);
 	if (!ret)
-		return FALSE;
+		return NULL;
 	g_debug ("raw values: red=%i, green=%i, blue=%i",
 		 color_native.R, color_native.G, color_native.B);
 
diff --git a/lib/ospark/osp-device.c b/lib/ospark/osp-device.c
index e07aee7..e9a5d5a 100644
--- a/lib/ospark/osp-device.c
+++ b/lib/ospark/osp-device.c
@@ -69,7 +69,7 @@ osp_device_open (GUsbDevice *device, GError **error)
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
 	if (!g_usb_device_open (device, error))
-		return NULL;
+		return FALSE;
 	if (!g_usb_device_claim_interface (device, 0x00, 0, error)) {
 		g_prefix_error (error, "Failed to claim interface: ");
 		return FALSE;
@@ -149,7 +149,7 @@ osp_device_query (GUsbDevice *device, OspCmd cmd,
 					 buffer_in, offset_wr,
 					 &actual_length,
 					 OSP_USB_TIMEOUT_MS, NULL, error))
-		return NULL;
+		return FALSE;
 
 	/* get reply */
 	buffer_out = g_new0 (guint8, 64);
@@ -157,7 +157,7 @@ osp_device_query (GUsbDevice *device, OspCmd cmd,
 					 buffer_out, OSP_DEVICE_EP_SIZE,
 					 &actual_length,
 					 OSP_USB_TIMEOUT_MS, NULL, error))
-		return NULL;
+		return FALSE;
 	if (g_getenv ("SPARK_PROTOCOL_DEBUG") != NULL)
 		cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, actual_length);
 
@@ -221,7 +221,7 @@ osp_device_query (GUsbDevice *device, OspCmd cmd,
 						 buffer_out, OSP_DEVICE_EP_SIZE,
 						 &actual_length,
 						 OSP_USB_TIMEOUT_MS, NULL, error))
-			return NULL;
+			return FALSE;
 		memcpy (*data_out + offset_wr, buffer_out, OSP_DEVICE_EP_SIZE);
 		if (g_getenv ("SPARK_PROTOCOL_DEBUG") != NULL)
 			cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, OSP_DEVICE_EP_SIZE);
@@ -288,7 +288,7 @@ osp_device_get_serial (GUsbDevice *device, GError **error)
 				     OSP_DEVICE_ERROR,
 				     OSP_DEVICE_ERROR_INTERNAL,
 				     "Expected serial number, got nothing");
-		return FALSE;
+		return NULL;
 	}
 
 	/* format value */
@@ -326,7 +326,7 @@ osp_device_get_fw_version (GUsbDevice *device, GError **error)
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected %i bytes, got %li", 2, data_len);
-		return FALSE;
+		return NULL;
 	}
 
 	/* format value */
@@ -354,7 +354,7 @@ osp_device_get_wavelength_cal_for_idx (GUsbDevice *device,
 	/* query hardware */
 	if (!osp_device_query (device, OSP_CMD_GET_WAVELENGTH_COEFFICIENT,
 			       idx_buf, 1, &data, &data_len, error))
-		return NULL;
+		return FALSE;
 
 	/* check values */
 	if (data_len != 4) {
@@ -441,7 +441,7 @@ osp_device_get_wavelength_cal (GUsbDevice *device, guint *length, GError **error
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected 1 bytes, got %li", data_len);
-		return FALSE;
+		return NULL;
 	}
 
 	/* check sanity */
@@ -450,7 +450,7 @@ osp_device_get_wavelength_cal (GUsbDevice *device, guint *length, GError **error
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected 4 coefs, got %i", data[0]);
-		return FALSE;
+		return NULL;
 	}
 
 	/* get the coefs */
@@ -461,7 +461,7 @@ osp_device_get_wavelength_cal (GUsbDevice *device, guint *length, GError **error
 							     &cx,
 							     error);
 		if (!ret)
-			return FALSE;
+			return NULL;
 		coefs[i] = cx;
 	}
 
@@ -488,13 +488,13 @@ osp_device_get_nonlinearity_cal_for_idx (GUsbDevice *device,
 	guint8 idx_buf[1] = { idx };
 	g_autofree guint8 *data = NULL;
 
-	g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL);
-	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+	g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
 	/* query hardware */
 	if (!osp_device_query (device, OSP_CMD_GET_NONLINEARITY_COEFFICIENT,
 			       idx_buf, 1, &data, &data_len, error))
-		return NULL;
+		return FALSE;
 
 	/* check values */
 	if (data_len != 4) {
@@ -549,7 +549,7 @@ osp_device_get_nonlinearity_cal (GUsbDevice *device, guint *length, GError **err
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected 1 bytes, got %li", data_len);
-		return FALSE;
+		return NULL;
 	}
 
 	/* check sanity */
@@ -558,7 +558,7 @@ osp_device_get_nonlinearity_cal (GUsbDevice *device, guint *length, GError **err
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected 8 coefs, got %i", data[0]);
-		return FALSE;
+		return NULL;
 	}
 
 	/* get the coefs */
@@ -569,7 +569,7 @@ osp_device_get_nonlinearity_cal (GUsbDevice *device, guint *length, GError **err
 							       &cx,
 							       error);
 		if (!ret)
-			return FALSE;
+			return NULL;
 		coefs[i] = cx;
 	}
 
@@ -615,7 +615,7 @@ osp_device_get_irradiance_cal (GUsbDevice *device, guint *length, GError **error
 			     OSP_DEVICE_ERROR,
 			     OSP_DEVICE_ERROR_INTERNAL,
 			     "Expected %i bytes, got %li", 4096 * 4, data_len);
-		return FALSE;
+		return NULL;
 	}
 
 	/* copy out the coefs */
diff --git a/src/cd-main.c b/src/cd-main.c
index 4da6fbe..045a6c0 100644
--- a/src/cd-main.c
+++ b/src/cd-main.c
@@ -229,7 +229,7 @@ cd_main_create_profile (CdMainPrivate *priv,
 
 	/* add the profile */
 	if (!cd_main_add_profile (priv, profile_tmp, error))
-		return FALSE;
+		return NULL;
 
 	/* different persistent scope */
 	switch (scope) {
@@ -247,14 +247,14 @@ cd_main_create_profile (CdMainPrivate *priv,
 				     CD_CLIENT_ERROR,
 				     CD_CLIENT_ERROR_NOT_SUPPORTED,
 				     "persistent profiles are no yet supported");
-		return FALSE;
+		return NULL;
 	default:
 		g_warning ("CdMain: Unsupported scope kind: %i", scope);
 		g_set_error (error,
 			     CD_CLIENT_ERROR,
 			     CD_CLIENT_ERROR_NOT_SUPPORTED,
 			     "Unsupported scope kind: %i", scope);
-		return FALSE;
+		return NULL;
 	}
 
 	/* success */
diff --git a/src/sensors/cd-sensor-argyll.c b/src/sensors/cd-sensor-argyll.c
index 7994c2f..f261fc3 100644
--- a/src/sensors/cd-sensor-argyll.c
+++ b/src/sensors/cd-sensor-argyll.c
@@ -284,7 +284,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-colorhug.c b/src/sensors/cd-sensor-colorhug.c
index 892e77d..31a1716 100644
--- a/src/sensors/cd-sensor-colorhug.c
+++ b/src/sensors/cd-sensor-colorhug.c
@@ -153,7 +153,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-dtp94.c b/src/sensors/cd-sensor-dtp94.c
index 9371bf2..1eae054 100644
--- a/src/sensors/cd-sensor-dtp94.c
+++ b/src/sensors/cd-sensor-dtp94.c
@@ -88,7 +88,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-dummy.c b/src/sensors/cd-sensor-dummy.c
index 8d3ff1e..f9b13ee 100644
--- a/src/sensors/cd-sensor-dummy.c
+++ b/src/sensors/cd-sensor-dummy.c
@@ -112,7 +112,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-huey.c b/src/sensors/cd-sensor-huey.c
index 32cdb8f..badf8f3 100644
--- a/src/sensors/cd-sensor-huey.c
+++ b/src/sensors/cd-sensor-huey.c
@@ -123,7 +123,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-munki.c b/src/sensors/cd-sensor-munki.c
index 56b2373..cb06492 100644
--- a/src/sensors/cd-sensor-munki.c
+++ b/src/sensors/cd-sensor-munki.c
@@ -418,7 +418,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
diff --git a/src/sensors/cd-sensor-spark.c b/src/sensors/cd-sensor-spark.c
index f04a670..3170117 100644
--- a/src/sensors/cd-sensor-spark.c
+++ b/src/sensors/cd-sensor-spark.c
@@ -427,7 +427,7 @@ cd_sensor_get_sample_async (CdSensor *sensor,
 CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }
 
@@ -468,7 +468,7 @@ cd_sensor_get_spectrum_async (CdSensor *sensor,
 CdSpectrum *
 cd_sensor_get_spectrum_finish (CdSensor *sensor, GAsyncResult *res, GError **error)
 {
-	g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE);
+	g_return_val_if_fail (g_task_is_valid (res, sensor), NULL);
 	return g_task_propagate_pointer (G_TASK (res), error);
 }