From f4998a763625e7c3fd285e5c3d01e4eec0ff37e2 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 1 Nov 2019 13:55:32 +0000 Subject: [PATCH] trivial: Fix up some NULL/FALSE confusion --- libfwupd/fwupd-client.c | 2 +- plugins/emmc/fu-emmc-device.c | 2 +- plugins/uefi/fu-uefi-common.c | 2 +- plugins/uefi/fu-uefi-udisks.c | 2 +- plugins/vli-usbhub/fu-vli-usbhub-device.c | 2 +- src/fu-firmware-dump.c | 6 ++++-- src/fu-quirks.c | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libfwupd/fwupd-client.c b/libfwupd/fwupd-client.c index 2ef0a041e..f0fca0fde 100644 --- a/libfwupd/fwupd-client.c +++ b/libfwupd/fwupd-client.c @@ -1223,7 +1223,7 @@ const gchar * fwupd_client_get_host_machine_id (FwupdClient *client) { FwupdClientPrivate *priv = GET_PRIVATE (client); - g_return_val_if_fail (FWUPD_IS_CLIENT (client), FALSE); + g_return_val_if_fail (FWUPD_IS_CLIENT (client), NULL); return priv->host_machine_id; } diff --git a/plugins/emmc/fu-emmc-device.c b/plugins/emmc/fu-emmc-device.c index 1a37af9dd..e9068c444 100644 --- a/plugins/emmc/fu-emmc-device.c +++ b/plugins/emmc/fu-emmc-device.c @@ -301,7 +301,7 @@ fu_emmc_device_prepare_firmware (FuDevice *device, FWUPD_ERROR, FWUPD_ERROR_INVALID_FILE, "firmware data size (%" G_GSIZE_FORMAT ") is not aligned", fw_size); - return FALSE; + return NULL; } return fu_firmware_new_from_bytes (fw); diff --git a/plugins/uefi/fu-uefi-common.c b/plugins/uefi/fu-uefi-common.c index ca0db28d7..cd77a8eef 100644 --- a/plugins/uefi/fu-uefi-common.c +++ b/plugins/uefi/fu-uefi-common.c @@ -364,7 +364,7 @@ fu_uefi_probe_udisks_esp (GError **error) devices = fu_uefi_udisks_get_block_devices (error); if (devices == NULL) - return FALSE; + return NULL; for (guint i = 0; i < devices->len; i++) { const gchar *obj = g_ptr_array_index (devices, i); gboolean esp = fu_uefi_udisks_objpath_is_esp (obj); diff --git a/plugins/uefi/fu-uefi-udisks.c b/plugins/uefi/fu-uefi-udisks.c index f809cb09b..7eb02e383 100644 --- a/plugins/uefi/fu-uefi-udisks.c +++ b/plugins/uefi/fu-uefi-udisks.c @@ -74,7 +74,7 @@ fu_uefi_udisks_get_block_devices (GError **error) G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); if (output == NULL) - return FALSE; + return NULL; devices = g_ptr_array_new_with_free_func (g_free); g_variant_get (output, "(ao)", &iter); while (g_variant_iter_next (iter, "o", &obj)) diff --git a/plugins/vli-usbhub/fu-vli-usbhub-device.c b/plugins/vli-usbhub/fu-vli-usbhub-device.c index 638c16158..226934803 100644 --- a/plugins/vli-usbhub/fu-vli-usbhub-device.c +++ b/plugins/vli-usbhub/fu-vli-usbhub-device.c @@ -669,7 +669,7 @@ fu_vli_usbhub_device_dump_firmware (FuVliUsbhubDevice *self, gsize bufsz, GError chk->data_sz, error)) { g_prefix_error (error, "SPI data read failed @0x%x: ", chk->address); - return FALSE; + return NULL; } fu_device_set_progress_full (FU_DEVICE (self), (gsize) i, (gsize) chunks->len); diff --git a/src/fu-firmware-dump.c b/src/fu-firmware-dump.c index 3760ed422..d7045db88 100644 --- a/src/fu-firmware-dump.c +++ b/src/fu-firmware-dump.c @@ -45,8 +45,10 @@ main (int argc, char **argv) g_printerr ("firmware invalid type, expected .srec or .hex\n"); return 2; } - if (!fu_firmware_parse (firmware, blob, FWUPD_INSTALL_FLAG_FORCE, &error)) - return FALSE; + if (!fu_firmware_parse (firmware, blob, FWUPD_INSTALL_FLAG_FORCE, &error)) { + g_printerr ("failed to parse file: %s\n", error->message); + return 3; + } str = fu_firmware_to_string (firmware); g_print ("%s", str); return 0; diff --git a/src/fu-quirks.c b/src/fu-quirks.c index 9c809c079..6d97f79a8 100644 --- a/src/fu-quirks.c +++ b/src/fu-quirks.c @@ -108,7 +108,7 @@ fu_quirks_convert_quirk_to_xml_cb (XbBuilderSource *self, g_autoptr(XbBuilderNode) bn = NULL; keys = g_key_file_get_keys (kf, groups[i], NULL, error); if (keys == NULL) - return FALSE; + return NULL; group_id = fu_quirks_build_group_key (groups[i]); bn = xb_builder_node_insert (root, "device", "id", group_id, NULL); for (guint j = 0; keys[j] != NULL; j++) {