From 1f9c0357880d873cdede9bb9144da3f97feaffc0 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Thu, 8 Apr 2021 12:09:18 -0500 Subject: [PATCH] trivial: fix some trailing whitespace problems across the project --- contrib/debian/gen_signing_json | 1 - libfwupd/fwupd-device-private.h | 1 - libfwupd/fwupd-plugin-private.h | 1 - libfwupd/fwupd-release-private.h | 1 - libfwupd/fwupd-security-attr-private.h | 1 - plugins/dfu/fu-dfu-self-test.c | 1 - plugins/elantp/fu-elantp-hid-device.c | 8 ++++---- plugins/synaptics-prometheus/fu-synaprom-device.c | 2 +- plugins/synaptics-rmi/fu-synaptics-rmi-ps2-device.h | 1 - plugins/thunderbolt/fu-thunderbolt-firmware-update.h | 2 +- plugins/uefi-capsule/fu-uefi-common.c | 2 +- plugins/vli/fu-vli-usbhub-firmware.c | 2 +- plugins/wacom-usb/fu-self-test.c | 1 - src/fu-engine-helper.c | 1 - 14 files changed, 8 insertions(+), 17 deletions(-) diff --git a/contrib/debian/gen_signing_json b/contrib/debian/gen_signing_json index 3b894351d..6105e9722 100755 --- a/contrib/debian/gen_signing_json +++ b/contrib/debian/gen_signing_json @@ -26,4 +26,3 @@ printf ' ]\n' >> $OUT printf ' }\n' >> $OUT printf ' }\n' >> $OUT printf '}\n' >> $OUT - diff --git a/libfwupd/fwupd-device-private.h b/libfwupd/fwupd-device-private.h index 77c774564..0dcecab32 100644 --- a/libfwupd/fwupd-device-private.h +++ b/libfwupd/fwupd-device-private.h @@ -22,4 +22,3 @@ void fwupd_device_to_json (FwupdDevice *device, JsonBuilder *builder); G_END_DECLS - diff --git a/libfwupd/fwupd-plugin-private.h b/libfwupd/fwupd-plugin-private.h index 8902ada43..4bdd437f6 100644 --- a/libfwupd/fwupd-plugin-private.h +++ b/libfwupd/fwupd-plugin-private.h @@ -17,4 +17,3 @@ void fwupd_plugin_to_json (FwupdPlugin *plugin, JsonBuilder *builder); G_END_DECLS - diff --git a/libfwupd/fwupd-release-private.h b/libfwupd/fwupd-release-private.h index ee5e38f95..7901e6b27 100644 --- a/libfwupd/fwupd-release-private.h +++ b/libfwupd/fwupd-release-private.h @@ -18,4 +18,3 @@ void fwupd_release_to_json (FwupdRelease *release, JsonBuilder *builder); G_END_DECLS - diff --git a/libfwupd/fwupd-security-attr-private.h b/libfwupd/fwupd-security-attr-private.h index b0849ba5c..3634e122a 100644 --- a/libfwupd/fwupd-security-attr-private.h +++ b/libfwupd/fwupd-security-attr-private.h @@ -51,4 +51,3 @@ void fwupd_security_attr_to_json (FwupdSecurityAttr *self, JsonBuilder *builder); G_END_DECLS - diff --git a/plugins/dfu/fu-dfu-self-test.c b/plugins/dfu/fu-dfu-self-test.c index dcb13f4b4..218617120 100644 --- a/plugins/dfu/fu-dfu-self-test.c +++ b/plugins/dfu/fu-dfu-self-test.c @@ -162,4 +162,3 @@ main (int argc, char **argv) g_test_add_func ("/dfu/target(DfuSe}", fu_dfu_target_dfuse_func); return g_test_run (); } - diff --git a/plugins/elantp/fu-elantp-hid-device.c b/plugins/elantp/fu-elantp-hid-device.c index fff60e843..0fc40025f 100644 --- a/plugins/elantp/fu-elantp-hid-device.c +++ b/plugins/elantp/fu-elantp-hid-device.c @@ -248,7 +248,7 @@ fu_elantp_hid_device_setup (FuDevice *device, GError **error) ic_type); return FALSE; } - + /* The ic_page_count is based on 64 bytes/page. */ fu_device_set_firmware_size (device, (guint64) self->ic_page_count * (guint64) 64); @@ -389,7 +389,7 @@ fu_elantp_hid_device_detach (FuDevice *device, GError **error) guint16 ic_type; guint8 buf[2] = { 0x0 }; guint16 tmp; - + /* sanity check */ if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_IS_BOOTLOADER)) { g_debug ("in bootloader mode, reset IC"); @@ -401,7 +401,7 @@ fu_elantp_hid_device_detach (FuDevice *device, GError **error) return FALSE; g_usleep (ELANTP_DELAY_RESET * 1000); } - + /* get OSM version */ if (!fu_elantp_hid_device_read_cmd (self, ETP_CMD_I2C_OSM_VERSION, buf, sizeof(buf), error)) { g_prefix_error (error, "failed to read OSM version: "); @@ -438,7 +438,7 @@ fu_elantp_hid_device_detach (FuDevice *device, GError **error) } else { self->fw_page_size = 128; } - + if (!fu_elantp_hid_device_write_cmd (self, ETP_CMD_I2C_IAP_TYPE, self->fw_page_size / 2, diff --git a/plugins/synaptics-prometheus/fu-synaprom-device.c b/plugins/synaptics-prometheus/fu-synaprom-device.c index 03dd38dc5..7d0d62ae9 100644 --- a/plugins/synaptics-prometheus/fu-synaprom-device.c +++ b/plugins/synaptics-prometheus/fu-synaprom-device.c @@ -147,7 +147,7 @@ fu_synaprom_device_set_version (FuSynapromDevice *self, { g_autofree gchar *str = NULL; - /* We decide to skip 10.02.xxxxxx firmware, so we force the minor version from 0x02 + /* We decide to skip 10.02.xxxxxx firmware, so we force the minor version from 0x02 ** to 0x01 to make the devices with 0x02 minor version firmware allow to be updated ** back to minor version 0x01. */ if (vmajor == 0x0a && vminor == 0x02) { diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-ps2-device.h b/plugins/synaptics-rmi/fu-synaptics-rmi-ps2-device.h index a5743896d..c40aa3a99 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-ps2-device.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-ps2-device.h @@ -11,4 +11,3 @@ #define FU_TYPE_SYNAPTICS_RMI_PS2_DEVICE (fu_synaptics_rmi_ps2_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapticsRmiPs2Device, fu_synaptics_rmi_ps2_device, FU, SYNAPTICS_RMI_PS2_DEVICE, FuSynapticsRmiDevice) - diff --git a/plugins/thunderbolt/fu-thunderbolt-firmware-update.h b/plugins/thunderbolt/fu-thunderbolt-firmware-update.h index eb29e4fae..6b074537c 100644 --- a/plugins/thunderbolt/fu-thunderbolt-firmware-update.h +++ b/plugins/thunderbolt/fu-thunderbolt-firmware-update.h @@ -11,4 +11,4 @@ #define FU_TYPE_THUNDERBOLT_FIRMWARE_UPDATE (fu_thunderbolt_firmware_update_get_type ()) G_DECLARE_FINAL_TYPE (FuThunderboltFirmwareUpdate, fu_thunderbolt_firmware_update, FU,THUNDERBOLT_FIRMWARE_UPDATE, FuThunderboltFirmware) -FuThunderboltFirmwareUpdate *fu_thunderbolt_firmware_update_new (void); \ No newline at end of file +FuThunderboltFirmwareUpdate *fu_thunderbolt_firmware_update_new (void); diff --git a/plugins/uefi-capsule/fu-uefi-common.c b/plugins/uefi-capsule/fu-uefi-common.c index 2c2e87063..01a363746 100644 --- a/plugins/uefi-capsule/fu-uefi-common.c +++ b/plugins/uefi-capsule/fu-uefi-common.c @@ -251,7 +251,7 @@ fu_uefi_get_esp_path_for_os (FuDevice *device, const gchar *base) g_debug ("Using ID_LIKE key from os-release"); return g_steal_pointer (&id_like_path); } - } + } /* try to fallback to use UEFI removable path if ID_LIKE path doesn't exist */ if (fu_device_get_metadata_boolean (device, "FallbacktoRemovablePath")) { esp_path = g_build_filename (base, "EFI", "boot", NULL); diff --git a/plugins/vli/fu-vli-usbhub-firmware.c b/plugins/vli/fu-vli-usbhub-firmware.c index db82285d3..d8fa2dc16 100644 --- a/plugins/vli/fu-vli-usbhub-firmware.c +++ b/plugins/vli/fu-vli-usbhub-firmware.c @@ -188,7 +188,7 @@ fu_vli_usbhub_firmware_parse (FuFirmware *firmware, g_prefix_error (error, "failed to get Q7/Q8 offset mapping: "); return FALSE; } - if (!fu_common_read_uint8_safe (buf, bufsz, adr_ofs + 0x2000 + 0x05, + if (!fu_common_read_uint8_safe (buf, bufsz, adr_ofs + 0x2000 + 0x05, &tmp, error)) { g_prefix_error (error, "failed to get offset version: "); return FALSE; diff --git a/plugins/wacom-usb/fu-self-test.c b/plugins/wacom-usb/fu-self-test.c index 433252b98..ad4c6d744 100644 --- a/plugins/wacom-usb/fu-self-test.c +++ b/plugins/wacom-usb/fu-self-test.c @@ -106,4 +106,3 @@ main (int argc, char **argv) g_test_add_func ("/wac/firmware{xml}", fu_wac_firmware_xml_func); return g_test_run (); } - diff --git a/src/fu-engine-helper.c b/src/fu-engine-helper.c index e223508bd..2a8f51356 100644 --- a/src/fu-engine-helper.c +++ b/src/fu-engine-helper.c @@ -80,4 +80,3 @@ fu_engine_update_motd (FuEngine *self, GError **error) _("Run `fwupdmgr get-upgrades` for more information.")); return g_file_set_contents (target, str->str, str->len, error); } -