From 8653e70480162b180859fca026aebd45f48d0573 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 9 Oct 2019 15:13:08 +0100 Subject: [PATCH] trivial: Remove G_BEGIN_DECLS from all private headers --- plugins/altos/fu-altos-device.h | 4 ---- plugins/altos/fu-altos-firmware.h | 4 ---- plugins/ata/fu-ata-device.h | 4 ---- plugins/colorhug/fu-colorhug-common.h | 4 ---- plugins/colorhug/fu-colorhug-device.h | 4 ---- plugins/csr/fu-csr-device.h | 4 ---- plugins/dell-dock/fu-dell-dock-hub.h | 4 ---- plugins/dell-dock/fu-dell-dock-i2c-ec.h | 4 ---- plugins/dell-dock/fu-dell-dock-i2c-mst.h | 4 ---- plugins/dell-dock/fu-dell-dock-i2c-tbt.h | 4 ---- plugins/dell-dock/fu-dell-dock-status.h | 4 ---- plugins/dfu/dfu-cipher-xtea.h | 4 ---- plugins/dfu/dfu-common.h | 4 ---- plugins/dfu/dfu-device-private.h | 4 ---- plugins/dfu/dfu-device.h | 4 ---- plugins/dfu/dfu-element.h | 4 ---- plugins/dfu/dfu-firmware.h | 4 ---- plugins/dfu/dfu-format-dfu.h | 4 ---- plugins/dfu/dfu-format-dfuse.h | 4 ---- plugins/dfu/dfu-format-ihex.h | 4 ---- plugins/dfu/dfu-format-metadata.h | 4 ---- plugins/dfu/dfu-format-raw.h | 4 ---- plugins/dfu/dfu-format-srec.h | 4 ---- plugins/dfu/dfu-image.h | 4 ---- plugins/dfu/dfu-patch.h | 4 ---- plugins/dfu/dfu-sector-private.h | 4 ---- plugins/dfu/dfu-sector.h | 4 ---- plugins/dfu/dfu-target-avr.h | 4 ---- plugins/dfu/dfu-target-private.h | 4 ---- plugins/dfu/dfu-target-stm.h | 4 ---- plugins/dfu/dfu-target.h | 4 ---- plugins/ebitdo/fu-ebitdo-common.h | 2 -- plugins/ebitdo/fu-ebitdo-device.h | 4 ---- plugins/fastboot/fu-fastboot-device.h | 4 ---- plugins/modem-manager/fu-mm-device.h | 4 ---- plugins/modem-manager/fu-mm-utils.h | 4 ---- plugins/modem-manager/fu-qmi-pdc-updater.h | 4 ---- plugins/nitrokey/fu-nitrokey-common.h | 4 ---- plugins/nitrokey/fu-nitrokey-device.h | 4 ---- plugins/nvme/fu-nvme-common.h | 4 ---- plugins/nvme/fu-nvme-device.h | 4 ---- plugins/optionrom/fu-optionrom-device.h | 4 ---- plugins/optionrom/fu-rom.h | 4 ---- plugins/redfish/fu-redfish-client.h | 4 ---- plugins/redfish/fu-redfish-common.h | 4 ---- plugins/rts54hid/fu-rts54hid-device.h | 4 ---- plugins/rts54hid/fu-rts54hid-module.h | 4 ---- plugins/rts54hub/fu-rts54hub-device.h | 4 ---- plugins/solokey/fu-solokey-device.h | 4 ---- plugins/solokey/fu-solokey-firmware.h | 4 ---- plugins/steelseries/fu-steelseries-device.h | 4 ---- plugins/superio/fu-superio-common.h | 4 ---- plugins/superio/fu-superio-device.h | 4 ---- plugins/superio/fu-superio-it85-device.h | 4 ---- plugins/superio/fu-superio-it89-device.h | 4 ---- plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.h | 4 ---- plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.h | 4 ---- plugins/synaptics-prometheus/fu-synaprom-config.h | 4 ---- plugins/synaptics-prometheus/fu-synaprom-device.h | 4 ---- plugins/synaptics-prometheus/fu-synaprom-firmware.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-common.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-device.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-firmware.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-v5-device.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-v6-device.h | 4 ---- plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.h | 4 ---- plugins/synapticsmst/fu-synapticsmst-device.h | 4 ---- plugins/thelio-io/fu-thelio-io-device.h | 4 ---- plugins/uefi/fu-uefi-bgrt.h | 4 ---- plugins/uefi/fu-uefi-bootmgr.h | 4 ---- plugins/uefi/fu-uefi-common.h | 4 ---- plugins/uefi/fu-uefi-device.h | 4 ---- plugins/uefi/fu-uefi-devpath.h | 4 ---- plugins/uefi/fu-uefi-pcrs.h | 4 ---- plugins/uefi/fu-uefi-update-info.h | 4 ---- plugins/uefi/fu-uefi-vars.h | 4 ---- plugins/unifying/fu-unifying-bootloader-nordic.h | 4 ---- plugins/unifying/fu-unifying-bootloader-texas.h | 4 ---- plugins/unifying/fu-unifying-bootloader.h | 4 ---- plugins/unifying/fu-unifying-common.h | 4 ---- plugins/unifying/fu-unifying-hidpp-msg.h | 4 ---- plugins/unifying/fu-unifying-hidpp.h | 4 ---- plugins/unifying/fu-unifying-peripheral.h | 4 ---- plugins/unifying/fu-unifying-runtime.h | 4 ---- plugins/wacom-raw/fu-wacom-aes-device.h | 4 ---- plugins/wacom-raw/fu-wacom-common.h | 4 ---- plugins/wacom-raw/fu-wacom-device.h | 4 ---- plugins/wacom-raw/fu-wacom-emr-device.h | 4 ---- plugins/wacom-usb/fu-wac-common.h | 4 ---- plugins/wacom-usb/fu-wac-device.h | 4 ---- plugins/wacom-usb/fu-wac-firmware.h | 4 ---- plugins/wacom-usb/fu-wac-module-bluetooth.h | 4 ---- plugins/wacom-usb/fu-wac-module-touch.h | 4 ---- plugins/wacom-usb/fu-wac-module.h | 4 ---- src/fu-archive.h | 4 ---- src/fu-chunk.h | 4 ---- src/fu-common-cab.h | 4 ---- src/fu-common-guid.h | 4 ---- src/fu-common-version.h | 3 --- src/fu-common.h | 4 ---- src/fu-config.h | 4 ---- src/fu-debug.h | 4 ---- src/fu-device-list.h | 4 ---- src/fu-device-locker.h | 4 ---- src/fu-device-metadata.h | 4 ---- src/fu-device-private.h | 4 ---- src/fu-device.h | 4 ---- src/fu-engine.h | 4 ---- src/fu-firmware-common.h | 4 ---- src/fu-firmware-image-private.h | 4 ---- src/fu-firmware-image.h | 4 ---- src/fu-firmware.h | 4 ---- src/fu-history.h | 4 ---- src/fu-hwids.h | 4 ---- src/fu-idle.h | 4 ---- src/fu-ihex-firmware.h | 4 ---- src/fu-install-task.h | 4 ---- src/fu-io-channel.h | 4 ---- src/fu-keyring-gpg.h | 4 ---- src/fu-keyring-pkcs7.h | 4 ---- src/fu-keyring-result.h | 4 ---- src/fu-keyring-utils.h | 4 ---- src/fu-keyring.h | 4 ---- src/fu-mutex.h | 4 ---- src/fu-plugin-list.h | 4 ---- src/fu-plugin-private.h | 4 ---- src/fu-plugin-vfuncs.h | 4 ---- src/fu-plugin.h | 4 ---- src/fu-progressbar.h | 4 ---- src/fu-quirks.h | 4 ---- src/fu-smbios.h | 4 ---- src/fu-srec-firmware.h | 4 ---- src/fu-systemd.h | 4 ---- src/fu-test.h | 4 ---- src/fu-udev-device-private.h | 4 ---- src/fu-udev-device.h | 4 ---- src/fu-usb-device-private.h | 4 ---- src/fu-usb-device.h | 4 ---- src/fu-util-common.h | 4 ---- 139 files changed, 553 deletions(-) diff --git a/plugins/altos/fu-altos-device.h b/plugins/altos/fu-altos-device.h index 774b83f82..1ba4df443 100644 --- a/plugins/altos/fu-altos-device.h +++ b/plugins/altos/fu-altos-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_ALTOS_DEVICE (fu_altos_device_get_type ()) G_DECLARE_FINAL_TYPE (FuAltosDevice, fu_altos_device, FU, ALTOS_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/altos/fu-altos-firmware.h b/plugins/altos/fu-altos-firmware.h index 939a86336..d42493306 100644 --- a/plugins/altos/fu-altos-firmware.h +++ b/plugins/altos/fu-altos-firmware.h @@ -8,12 +8,8 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_ALTOS_FIRMWARE (fu_altos_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuAltosFirmware, fu_altos_firmware, FU, ALTOS_FIRMWARE, FuFirmware) FuFirmware *fu_altos_firmware_new (void); - -G_END_DECLS diff --git a/plugins/ata/fu-ata-device.h b/plugins/ata/fu-ata-device.h index e9546457a..dffae46f6 100644 --- a/plugins/ata/fu-ata-device.h +++ b/plugins/ata/fu-ata-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_ATA_DEVICE (fu_ata_device_get_type ()) G_DECLARE_FINAL_TYPE (FuAtaDevice, fu_ata_device, FU, ATA_DEVICE, FuUdevDevice) @@ -20,5 +18,3 @@ FuAtaDevice *fu_ata_device_new_from_blob (const guint8 *buf, /* for self tests */ guint8 fu_ata_device_get_transfer_mode (FuAtaDevice *self); guint16 fu_ata_device_get_transfer_blocks (FuAtaDevice *self); - -G_END_DECLS diff --git a/plugins/colorhug/fu-colorhug-common.h b/plugins/colorhug/fu-colorhug-common.h index 5e65c05e8..61723a283 100644 --- a/plugins/colorhug/fu-colorhug-common.h +++ b/plugins/colorhug/fu-colorhug-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - typedef enum { CH_ERROR_NONE, CH_ERROR_UNKNOWN_CMD, @@ -51,5 +49,3 @@ typedef enum { } ChError; const gchar *ch_strerror (ChError error_enum); - -G_END_DECLS diff --git a/plugins/colorhug/fu-colorhug-device.h b/plugins/colorhug/fu-colorhug-device.h index 2d86ec9ff..ab070faec 100644 --- a/plugins/colorhug/fu-colorhug-device.h +++ b/plugins/colorhug/fu-colorhug-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_COLORHUG_DEVICE (fu_colorhug_device_get_type ()) G_DECLARE_FINAL_TYPE (FuColorhugDevice, fu_colorhug_device, FU, COLORHUG_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/csr/fu-csr-device.h b/plugins/csr/fu-csr-device.h index 654f5ee94..7518bd08a 100644 --- a/plugins/csr/fu-csr-device.h +++ b/plugins/csr/fu-csr-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_CSR_DEVICE (fu_csr_device_get_type ()) G_DECLARE_FINAL_TYPE (FuCsrDevice, fu_csr_device, FU, CSR_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/dell-dock/fu-dell-dock-hub.h b/plugins/dell-dock/fu-dell-dock-hub.h index 916cf7269..365664018 100644 --- a/plugins/dell-dock/fu-dell-dock-hub.h +++ b/plugins/dell-dock/fu-dell-dock-hub.h @@ -19,11 +19,7 @@ #include "fu-usb-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DELL_DOCK_HUB (fu_dell_dock_hub_get_type ()) G_DECLARE_FINAL_TYPE (FuDellDockHub, fu_dell_dock_hub, FU, DELL_DOCK_HUB, FuUsbDevice) FuDellDockHub *fu_dell_dock_hub_new (FuUsbDevice *device); - -G_END_DECLS diff --git a/plugins/dell-dock/fu-dell-dock-i2c-ec.h b/plugins/dell-dock/fu-dell-dock-i2c-ec.h index 4cedeb1ac..7309498ce 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-ec.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-ec.h @@ -21,15 +21,11 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DELL_DOCK_EC (fu_dell_dock_ec_get_type ()) G_DECLARE_FINAL_TYPE (FuDellDockEc, fu_dell_dock_ec, FU, DELL_DOCK_EC, FuDevice) FuDellDockEc *fu_dell_dock_ec_new (FuDevice *symbiote); -G_END_DECLS - gboolean fu_dell_dock_ec_needs_tbt (FuDevice *device); gboolean fu_dell_dock_ec_tbt_passive (FuDevice *device); gboolean fu_dell_dock_ec_modify_lock (FuDevice *self, diff --git a/plugins/dell-dock/fu-dell-dock-i2c-mst.h b/plugins/dell-dock/fu-dell-dock-i2c-mst.h index 806ecbd99..d00910d93 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-mst.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-mst.h @@ -19,11 +19,7 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DELL_DOCK_MST (fu_dell_dock_mst_get_type ()) G_DECLARE_FINAL_TYPE (FuDellDockMst, fu_dell_dock_mst, FU, DELL_DOCK_MST, FuDevice) FuDellDockMst *fu_dell_dock_mst_new (void); - -G_END_DECLS diff --git a/plugins/dell-dock/fu-dell-dock-i2c-tbt.h b/plugins/dell-dock/fu-dell-dock-i2c-tbt.h index 2dfcd758a..f1953b62f 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-tbt.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-tbt.h @@ -20,11 +20,7 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DELL_DOCK_TBT (fu_dell_dock_tbt_get_type ()) G_DECLARE_FINAL_TYPE (FuDellDockTbt, fu_dell_dock_tbt, FU, DELL_DOCK_TBT, FuDevice) FuDellDockTbt *fu_dell_dock_tbt_new (void); - -G_END_DECLS diff --git a/plugins/dell-dock/fu-dell-dock-status.h b/plugins/dell-dock/fu-dell-dock-status.h index c5f207c2f..36bf9fc9f 100644 --- a/plugins/dell-dock/fu-dell-dock-status.h +++ b/plugins/dell-dock/fu-dell-dock-status.h @@ -19,11 +19,7 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DELL_DOCK_STATUS (fu_dell_dock_status_get_type ()) G_DECLARE_FINAL_TYPE (FuDellDockStatus, fu_dell_dock_status, FU, DELL_DOCK_STATUS, FuDevice) FuDellDockStatus *fu_dell_dock_status_new (void); - -G_END_DECLS diff --git a/plugins/dfu/dfu-cipher-xtea.h b/plugins/dfu/dfu-cipher-xtea.h index 828e37578..5c84d6b90 100644 --- a/plugins/dfu/dfu-cipher-xtea.h +++ b/plugins/dfu/dfu-cipher-xtea.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - gboolean dfu_cipher_encrypt_xtea (const gchar *key, guint8 *data, guint32 length, @@ -19,5 +17,3 @@ gboolean dfu_cipher_decrypt_xtea (const gchar *key, guint8 *data, guint32 length, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-common.h b/plugins/dfu/dfu-common.h index 148a30b86..63232950c 100644 --- a/plugins/dfu/dfu-common.h +++ b/plugins/dfu/dfu-common.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - /** * DfuRequest: * @DFU_REQUEST_DETACH: Detach @@ -156,5 +154,3 @@ const gchar *dfu_version_to_string (DfuVersion version); /* helpers */ GBytes *dfu_utils_bytes_join_array (GPtrArray *chunks); - -G_END_DECLS diff --git a/plugins/dfu/dfu-device-private.h b/plugins/dfu/dfu-device-private.h index 3c257a258..90b9be84e 100644 --- a/plugins/dfu/dfu-device-private.h +++ b/plugins/dfu/dfu-device-private.h @@ -14,8 +14,6 @@ #include "dfu-device.h" -G_BEGIN_DECLS - void dfu_device_error_fixup (DfuDevice *device, GError **error); guint dfu_device_get_download_timeout (DfuDevice *device); @@ -23,5 +21,3 @@ gchar *dfu_device_get_quirks_as_string (DfuDevice *device); gchar *dfu_device_get_attributes_as_string (DfuDevice *device); gboolean dfu_device_ensure_interface (DfuDevice *device, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-device.h b/plugins/dfu/dfu-device.h index b9cc375d4..6d09c1992 100644 --- a/plugins/dfu/dfu-device.h +++ b/plugins/dfu/dfu-device.h @@ -16,8 +16,6 @@ #include "dfu-target.h" #include "dfu-firmware.h" -G_BEGIN_DECLS - #define DFU_TYPE_DEVICE (dfu_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuDevice, dfu_device, DFU, DEVICE, FuUsbDevice) @@ -159,5 +157,3 @@ void dfu_device_set_timeout (DfuDevice *device, void dfu_device_set_usb_context (DfuDevice *device, GUsbContext *quirks); GUsbContext *dfu_device_get_usb_context (DfuDevice *device); - -G_END_DECLS diff --git a/plugins/dfu/dfu-element.h b/plugins/dfu/dfu-element.h index ee838c49b..c39dcca74 100644 --- a/plugins/dfu/dfu-element.h +++ b/plugins/dfu/dfu-element.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - #define DFU_TYPE_ELEMENT (dfu_element_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuElement, dfu_element, DFU, ELEMENT, GObject) @@ -33,5 +31,3 @@ void dfu_element_set_padding_value (DfuElement *element, guint8 padding_value); gchar *dfu_element_to_string (DfuElement *element); - -G_END_DECLS diff --git a/plugins/dfu/dfu-firmware.h b/plugins/dfu/dfu-firmware.h index d43fe7db8..d63ef2322 100644 --- a/plugins/dfu/dfu-firmware.h +++ b/plugins/dfu/dfu-firmware.h @@ -12,8 +12,6 @@ #include "dfu-common.h" #include "dfu-image.h" -G_BEGIN_DECLS - #define DFU_TYPE_FIRMWARE (dfu_firmware_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuFirmware, dfu_firmware, DFU, FIRMWARE, GObject) @@ -117,5 +115,3 @@ void dfu_firmware_set_metadata (DfuFirmware *firmware, const gchar *value); void dfu_firmware_remove_metadata (DfuFirmware *firmware, const gchar *key); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-dfu.h b/plugins/dfu/dfu-format-dfu.h index dae1c5798..84723c90f 100644 --- a/plugins/dfu/dfu-format-dfu.h +++ b/plugins/dfu/dfu-format-dfu.h @@ -11,8 +11,6 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - DfuFirmwareFormat dfu_firmware_detect_dfu (GBytes *bytes); GBytes *dfu_firmware_to_dfu (DfuFirmware *firmware, GError **error); @@ -20,5 +18,3 @@ gboolean dfu_firmware_from_dfu (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-dfuse.h b/plugins/dfu/dfu-format-dfuse.h index eec640498..816514170 100644 --- a/plugins/dfu/dfu-format-dfuse.h +++ b/plugins/dfu/dfu-format-dfuse.h @@ -11,8 +11,6 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - DfuFirmwareFormat dfu_firmware_detect_dfuse (GBytes *bytes); GBytes *dfu_firmware_to_dfuse (DfuFirmware *firmware, GError **error); @@ -20,5 +18,3 @@ gboolean dfu_firmware_from_dfuse (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-ihex.h b/plugins/dfu/dfu-format-ihex.h index 217bd43d8..ae8ca0279 100644 --- a/plugins/dfu/dfu-format-ihex.h +++ b/plugins/dfu/dfu-format-ihex.h @@ -11,8 +11,6 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - DfuFirmwareFormat dfu_firmware_detect_ihex (GBytes *bytes); GBytes *dfu_firmware_to_ihex (DfuFirmware *firmware, GError **error); @@ -20,5 +18,3 @@ gboolean dfu_firmware_from_ihex (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-metadata.h b/plugins/dfu/dfu-format-metadata.h index c2ef034d3..d9ce02854 100644 --- a/plugins/dfu/dfu-format-metadata.h +++ b/plugins/dfu/dfu-format-metadata.h @@ -11,13 +11,9 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - GBytes *dfu_firmware_to_metadata (DfuFirmware *firmware, GError **error); gboolean dfu_firmware_from_metadata (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-raw.h b/plugins/dfu/dfu-format-raw.h index ce86a8bae..8ea4c4176 100644 --- a/plugins/dfu/dfu-format-raw.h +++ b/plugins/dfu/dfu-format-raw.h @@ -11,8 +11,6 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - DfuFirmwareFormat dfu_firmware_detect_raw (GBytes *bytes); GBytes *dfu_firmware_to_raw (DfuFirmware *firmware, GError **error); @@ -20,5 +18,3 @@ gboolean dfu_firmware_from_raw (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-format-srec.h b/plugins/dfu/dfu-format-srec.h index b5a9a87e3..ae1302e57 100644 --- a/plugins/dfu/dfu-format-srec.h +++ b/plugins/dfu/dfu-format-srec.h @@ -11,8 +11,6 @@ #include "dfu-firmware.h" -G_BEGIN_DECLS - DfuFirmwareFormat dfu_firmware_detect_srec (GBytes *bytes); GBytes *dfu_firmware_to_srec (DfuFirmware *firmware, GError **error); @@ -20,5 +18,3 @@ gboolean dfu_firmware_from_srec (DfuFirmware *firmware, GBytes *bytes, DfuFirmwareParseFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-image.h b/plugins/dfu/dfu-image.h index 9ac6573a3..82d06287e 100644 --- a/plugins/dfu/dfu-image.h +++ b/plugins/dfu/dfu-image.h @@ -11,8 +11,6 @@ #include "dfu-element.h" -G_BEGIN_DECLS - #define DFU_TYPE_IMAGE (dfu_image_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuImage, dfu_image, DFU, IMAGE, GObject) @@ -40,5 +38,3 @@ void dfu_image_set_name (DfuImage *image, const gchar *name); gchar *dfu_image_to_string (DfuImage *image); - -G_END_DECLS diff --git a/plugins/dfu/dfu-patch.h b/plugins/dfu/dfu-patch.h index 5f6462f39..2004d8702 100644 --- a/plugins/dfu/dfu-patch.h +++ b/plugins/dfu/dfu-patch.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - #define DFU_TYPE_PATCH (dfu_patch_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuPatch, dfu_patch, DFU, PATCH, GObject) @@ -51,5 +49,3 @@ GBytes *dfu_patch_apply (DfuPatch *self, GError **error); GBytes *dfu_patch_get_checksum_old (DfuPatch *self); GBytes *dfu_patch_get_checksum_new (DfuPatch *self); - -G_END_DECLS diff --git a/plugins/dfu/dfu-sector-private.h b/plugins/dfu/dfu-sector-private.h index 723aa30bc..3a35b18e7 100644 --- a/plugins/dfu/dfu-sector-private.h +++ b/plugins/dfu/dfu-sector-private.h @@ -8,13 +8,9 @@ #include "dfu-sector.h" -G_BEGIN_DECLS - DfuSector *dfu_sector_new (guint32 address, guint32 size, guint32 size_left, guint16 zone, guint16 number, DfuSectorCap cap); - -G_END_DECLS diff --git a/plugins/dfu/dfu-sector.h b/plugins/dfu/dfu-sector.h index 8317cb8b0..11a74c939 100644 --- a/plugins/dfu/dfu-sector.h +++ b/plugins/dfu/dfu-sector.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - #define DFU_TYPE_SECTOR (dfu_sector_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuSector, dfu_sector, DFU, SECTOR, GObject) @@ -46,5 +44,3 @@ guint16 dfu_sector_get_number (DfuSector *sector); gboolean dfu_sector_has_cap (DfuSector *sector, DfuSectorCap cap); gchar *dfu_sector_to_string (DfuSector *sector); - -G_END_DECLS diff --git a/plugins/dfu/dfu-target-avr.h b/plugins/dfu/dfu-target-avr.h index 7c3fff25b..fcec0d166 100644 --- a/plugins/dfu/dfu-target-avr.h +++ b/plugins/dfu/dfu-target-avr.h @@ -11,8 +11,6 @@ #include "dfu-target.h" -G_BEGIN_DECLS - #define DFU_TYPE_TARGET_AVR (dfu_target_avr_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuTargetAvr, dfu_target_avr, DFU, TARGET_AVR, DfuTarget) @@ -22,5 +20,3 @@ struct _DfuTargetAvrClass }; DfuTarget *dfu_target_avr_new (void); - -G_END_DECLS diff --git a/plugins/dfu/dfu-target-private.h b/plugins/dfu/dfu-target-private.h index 6c6cafe9d..1b3177cc0 100644 --- a/plugins/dfu/dfu-target-private.h +++ b/plugins/dfu/dfu-target-private.h @@ -12,8 +12,6 @@ #include "dfu-target.h" #include "dfu-sector.h" -G_BEGIN_DECLS - DfuTarget *dfu_target_new (void); GBytes *dfu_target_upload_chunk (DfuTarget *target, @@ -53,5 +51,3 @@ DfuSector *dfu_target_get_sector_for_addr (DfuTarget *target, gboolean dfu_target_parse_sectors (DfuTarget *target, const gchar *alt_name, GError **error); - -G_END_DECLS diff --git a/plugins/dfu/dfu-target-stm.h b/plugins/dfu/dfu-target-stm.h index 5233ab022..e9c1affe4 100644 --- a/plugins/dfu/dfu-target-stm.h +++ b/plugins/dfu/dfu-target-stm.h @@ -11,8 +11,6 @@ #include "dfu-target.h" -G_BEGIN_DECLS - #define DFU_TYPE_TARGET_STM (dfu_target_stm_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuTargetStm, dfu_target_stm, DFU, TARGET_STM, DfuTarget) @@ -22,5 +20,3 @@ struct _DfuTargetStmClass }; DfuTarget *dfu_target_stm_new (void); - -G_END_DECLS diff --git a/plugins/dfu/dfu-target.h b/plugins/dfu/dfu-target.h index 609164812..c88a669ce 100644 --- a/plugins/dfu/dfu-target.h +++ b/plugins/dfu/dfu-target.h @@ -16,8 +16,6 @@ #include "fwupd-enums.h" -G_BEGIN_DECLS - #define DFU_TYPE_TARGET (dfu_target_get_type ()) G_DECLARE_DERIVABLE_TYPE (DfuTarget, dfu_target, DFU, TARGET, GUsbDevice) @@ -88,5 +86,3 @@ gboolean dfu_target_download (DfuTarget *target, gboolean dfu_target_mass_erase (DfuTarget *target, GError **error); DfuCipherKind dfu_target_get_cipher_kind (DfuTarget *target); - -G_END_DECLS diff --git a/plugins/ebitdo/fu-ebitdo-common.h b/plugins/ebitdo/fu-ebitdo-common.h index 79b1b98fe..77d614902 100644 --- a/plugins/ebitdo/fu-ebitdo-common.h +++ b/plugins/ebitdo/fu-ebitdo-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - /* little endian */ typedef struct __attribute__((packed)) { guint32 version; diff --git a/plugins/ebitdo/fu-ebitdo-device.h b/plugins/ebitdo/fu-ebitdo-device.h index 808a4432d..d52c22e91 100644 --- a/plugins/ebitdo/fu-ebitdo-device.h +++ b/plugins/ebitdo/fu-ebitdo-device.h @@ -8,12 +8,8 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_EBITDO_DEVICE (fu_ebitdo_device_get_type ()) G_DECLARE_FINAL_TYPE (FuEbitdoDevice, fu_ebitdo_device, FU, EBITDO_DEVICE, FuUsbDevice) /* getters */ const guint32 *fu_ebitdo_device_get_serial (FuEbitdoDevice *device); - -G_END_DECLS diff --git a/plugins/fastboot/fu-fastboot-device.h b/plugins/fastboot/fu-fastboot-device.h index 630fdc3e1..572c3c4a1 100644 --- a/plugins/fastboot/fu-fastboot-device.h +++ b/plugins/fastboot/fu-fastboot-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_FASTBOOT_DEVICE (fu_fastboot_device_get_type ()) G_DECLARE_FINAL_TYPE (FuFastbootDevice, fu_fastboot_device, FU, FASTBOOT_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/modem-manager/fu-mm-device.h b/plugins/modem-manager/fu-mm-device.h index 9fff03e42..02450bad5 100644 --- a/plugins/modem-manager/fu-mm-device.h +++ b/plugins/modem-manager/fu-mm-device.h @@ -12,8 +12,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_MM_DEVICE (fu_mm_device_get_type ()) G_DECLARE_FINAL_TYPE (FuMmDevice, fu_mm_device, FU, MM_DEVICE, FuDevice) @@ -49,6 +47,4 @@ void fu_mm_device_udev_add_port (FuMmDevice *device, const gchar *path, gint ifnum); -G_END_DECLS - #endif /* __FU_MM_DEVICE_H */ diff --git a/plugins/modem-manager/fu-mm-utils.h b/plugins/modem-manager/fu-mm-utils.h index f35952d88..c6c3eaa2f 100644 --- a/plugins/modem-manager/fu-mm-utils.h +++ b/plugins/modem-manager/fu-mm-utils.h @@ -10,8 +10,6 @@ #include "config.h" #include -G_BEGIN_DECLS - #ifndef HAVE_GUDEV_232 #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" @@ -29,6 +27,4 @@ gboolean fu_mm_utils_get_port_info (const gchar *path, gint *port_ifnum, GError **error); -G_END_DECLS - #endif /* __FU_MM_UTILS_H */ diff --git a/plugins/modem-manager/fu-qmi-pdc-updater.h b/plugins/modem-manager/fu-qmi-pdc-updater.h index d1465cb4b..9940f518a 100644 --- a/plugins/modem-manager/fu-qmi-pdc-updater.h +++ b/plugins/modem-manager/fu-qmi-pdc-updater.h @@ -9,8 +9,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_QMI_PDC_UPDATER (fu_qmi_pdc_updater_get_type ()) G_DECLARE_FINAL_TYPE (FuQmiPdcUpdater, fu_qmi_pdc_updater, FU, QMI_PDC_UPDATER, GObject) @@ -27,6 +25,4 @@ gboolean fu_qmi_pdc_updater_activate (FuQmiPdcUpdater *self, gboolean fu_qmi_pdc_updater_close (FuQmiPdcUpdater *self, GError **error); -G_END_DECLS - #endif /* __FU_QMI_PDC_UPDATER_H */ diff --git a/plugins/nitrokey/fu-nitrokey-common.h b/plugins/nitrokey/fu-nitrokey-common.h index 9b0551cc6..00685a38b 100644 --- a/plugins/nitrokey/fu-nitrokey-common.h +++ b/plugins/nitrokey/fu-nitrokey-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - guint32 fu_nitrokey_perform_crc32 (const guint8 *data, gsize size); @@ -62,5 +60,3 @@ typedef struct __attribute__((packed)) { guint32 ActiveSmartCardID; guint8 StickKeysNotInitiated; } NitrokeyGetDeviceStatusPayload; - -G_END_DECLS diff --git a/plugins/nitrokey/fu-nitrokey-device.h b/plugins/nitrokey/fu-nitrokey-device.h index b43bfb5e5..100c4adb2 100644 --- a/plugins/nitrokey/fu-nitrokey-device.h +++ b/plugins/nitrokey/fu-nitrokey-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_NITROKEY_DEVICE (fu_nitrokey_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuNitrokeyDevice, fu_nitrokey_device, FU, NITROKEY_DEVICE, FuUsbDevice) @@ -17,5 +15,3 @@ struct _FuNitrokeyDeviceClass { FuUsbDeviceClass parent_class; }; - -G_END_DECLS diff --git a/plugins/nvme/fu-nvme-common.h b/plugins/nvme/fu-nvme-common.h index 4287c9524..755539dd3 100644 --- a/plugins/nvme/fu-nvme-common.h +++ b/plugins/nvme/fu-nvme-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - enum { /* * Generic Command Status: @@ -122,5 +120,3 @@ enum { }; const gchar *fu_nvme_status_to_string (guint32 status); - -G_END_DECLS diff --git a/plugins/nvme/fu-nvme-device.h b/plugins/nvme/fu-nvme-device.h index e19a10a40..6f0ad3050 100644 --- a/plugins/nvme/fu-nvme-device.h +++ b/plugins/nvme/fu-nvme-device.h @@ -8,13 +8,9 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_NVME_DEVICE (fu_nvme_device_get_type ()) G_DECLARE_FINAL_TYPE (FuNvmeDevice, fu_nvme_device, FU, NVME_DEVICE, FuUdevDevice) FuNvmeDevice *fu_nvme_device_new_from_blob (const guint8 *buf, gsize sz, GError **error); - -G_END_DECLS diff --git a/plugins/optionrom/fu-optionrom-device.h b/plugins/optionrom/fu-optionrom-device.h index 149f0c146..00455d7a4 100644 --- a/plugins/optionrom/fu-optionrom-device.h +++ b/plugins/optionrom/fu-optionrom-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_OPTIONROM_DEVICE (fu_optionrom_device_get_type ()) G_DECLARE_FINAL_TYPE (FuOptionromDevice, fu_optionrom_device, FU, OPTIONROM_DEVICE, FuUdevDevice) - -G_END_DECLS diff --git a/plugins/optionrom/fu-rom.h b/plugins/optionrom/fu-rom.h index d7a23e583..45088fe21 100644 --- a/plugins/optionrom/fu-rom.h +++ b/plugins/optionrom/fu-rom.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_ROM (fu_rom_get_type ()) G_DECLARE_FINAL_TYPE (FuRom, fu_rom, FU, ROM, GObject) @@ -50,5 +48,3 @@ GBytes *fu_rom_get_data (FuRom *self); guint16 fu_rom_get_vendor (FuRom *self); guint16 fu_rom_get_model (FuRom *self); const gchar *fu_rom_kind_to_string (FuRomKind kind); - -G_END_DECLS diff --git a/plugins/redfish/fu-redfish-client.h b/plugins/redfish/fu-redfish-client.h index fd8512493..5833057f8 100644 --- a/plugins/redfish/fu-redfish-client.h +++ b/plugins/redfish/fu-redfish-client.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define REDFISH_TYPE_CLIENT (fu_redfish_client_get_type ()) G_DECLARE_FINAL_TYPE (FuRedfishClient, fu_redfish_client, FU, REDFISH_CLIENT, GObject) @@ -37,5 +35,3 @@ gboolean fu_redfish_client_setup (FuRedfishClient *self, gboolean fu_redfish_client_coldplug (FuRedfishClient *self, GError **error); GPtrArray *fu_redfish_client_get_devices (FuRedfishClient *self); - -G_END_DECLS diff --git a/plugins/redfish/fu-redfish-common.h b/plugins/redfish/fu-redfish-common.h index b54b88e66..baaee9f08 100644 --- a/plugins/redfish/fu-redfish-common.h +++ b/plugins/redfish/fu-redfish-common.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - /* SMBIOS */ #define REDFISH_SMBIOS_TABLE_TYPE 0x42 @@ -46,5 +44,3 @@ GBytes *fu_redfish_common_get_evivar_raw (efi_guid_t guid, GError **error); gchar *fu_redfish_common_buffer_to_ipv4 (const guint8 *buffer); gchar *fu_redfish_common_buffer_to_ipv6 (const guint8 *buffer); - -G_END_DECLS diff --git a/plugins/rts54hid/fu-rts54hid-device.h b/plugins/rts54hid/fu-rts54hid-device.h index be779b758..0da97019b 100644 --- a/plugins/rts54hid/fu-rts54hid-device.h +++ b/plugins/rts54hid/fu-rts54hid-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_RTS54HID_DEVICE (fu_rts54hid_device_get_type ()) G_DECLARE_FINAL_TYPE (FuRts54HidDevice, fu_rts54hid_device, FU, RTS54HID_DEVICE, FuUsbDevice) @@ -21,5 +19,3 @@ gboolean fu_rts54hid_device_get_report (FuRts54HidDevice *self, guint8 *buf, gsize buf_sz, GError **error); - -G_END_DECLS diff --git a/plugins/rts54hid/fu-rts54hid-module.h b/plugins/rts54hid/fu-rts54hid-module.h index 6b4a4befa..034e681e2 100644 --- a/plugins/rts54hid/fu-rts54hid-module.h +++ b/plugins/rts54hid/fu-rts54hid-module.h @@ -8,11 +8,7 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_RTS54HID_MODULE (fu_rts54hid_module_get_type ()) G_DECLARE_FINAL_TYPE (FuRts54HidModule, fu_rts54hid_module, FU, RTS54HID_MODULE, FuDevice) FuRts54HidModule *fu_rts54hid_module_new (void); - -G_END_DECLS diff --git a/plugins/rts54hub/fu-rts54hub-device.h b/plugins/rts54hub/fu-rts54hub-device.h index a4d849fc4..4b7655437 100644 --- a/plugins/rts54hub/fu-rts54hub-device.h +++ b/plugins/rts54hub/fu-rts54hub-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_RTS54HUB_DEVICE (fu_rts54hub_device_get_type ()) G_DECLARE_FINAL_TYPE (FuRts54HubDevice, fu_rts54hub_device, FU, RTS54HUB_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/solokey/fu-solokey-device.h b/plugins/solokey/fu-solokey-device.h index 8461eeec7..cc85a0ca1 100644 --- a/plugins/solokey/fu-solokey-device.h +++ b/plugins/solokey/fu-solokey-device.h @@ -8,9 +8,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_SOLOKEY_DEVICE (fu_solokey_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSolokeyDevice, fu_solokey_device, FU, SOLOKEY_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/solokey/fu-solokey-firmware.h b/plugins/solokey/fu-solokey-firmware.h index 7bf9110a5..b23da2590 100644 --- a/plugins/solokey/fu-solokey-firmware.h +++ b/plugins/solokey/fu-solokey-firmware.h @@ -8,11 +8,7 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_SOLOKEY_FIRMWARE (fu_solokey_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuSolokeyFirmware, fu_solokey_firmware, FU, SOLOKEY_FIRMWARE, FuFirmware) FuFirmware *fu_solokey_firmware_new (void); - -G_END_DECLS diff --git a/plugins/steelseries/fu-steelseries-device.h b/plugins/steelseries/fu-steelseries-device.h index ab42a8d0e..7970bc298 100644 --- a/plugins/steelseries/fu-steelseries-device.h +++ b/plugins/steelseries/fu-steelseries-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_STEELSERIES_DEVICE (fu_steelseries_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuSteelseriesDevice, fu_steelseries_device, FU, STEELSERIES_DEVICE, FuUsbDevice) @@ -17,5 +15,3 @@ struct _FuSteelseriesDeviceClass { FuUsbDeviceClass parent_class; }; - -G_END_DECLS diff --git a/plugins/superio/fu-superio-common.h b/plugins/superio/fu-superio-common.h index 3060d536a..111aad70c 100644 --- a/plugins/superio/fu-superio-common.h +++ b/plugins/superio/fu-superio-common.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - /* for all LDNs */ #define SIO_LDNxx_IDX_LDNSEL 0x07 #define SIO_LDNxx_IDX_CHIPID1 0x20 @@ -127,5 +125,3 @@ gboolean fu_superio_inb (gint fd, guint16 port, guint8 *data, GError **error); - -G_END_DECLS diff --git a/plugins/superio/fu-superio-device.h b/plugins/superio/fu-superio-device.h index 88f4d5ed0..be7ea1d46 100644 --- a/plugins/superio/fu-superio-device.h +++ b/plugins/superio/fu-superio-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_SUPERIO_DEVICE (fu_superio_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuSuperioDevice, fu_superio_device, FU, SUPERIO_DEVICE, FuDevice) @@ -45,5 +43,3 @@ gboolean fu_superio_device_regwrite (FuSuperioDevice *self, guint8 addr, guint8 data, GError **error); - -G_END_DECLS diff --git a/plugins/superio/fu-superio-it85-device.h b/plugins/superio/fu-superio-it85-device.h index 36443a8ad..08c50b804 100644 --- a/plugins/superio/fu-superio-it85-device.h +++ b/plugins/superio/fu-superio-it85-device.h @@ -8,9 +8,5 @@ #include "fu-superio-device.h" -G_BEGIN_DECLS - #define FU_TYPE_SUPERIO_IT85_DEVICE (fu_superio_it85_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSuperioIt85Device, fu_superio_it85_device, FU, SUPERIO_IT85_DEVICE, FuSuperioDevice) - -G_END_DECLS diff --git a/plugins/superio/fu-superio-it89-device.h b/plugins/superio/fu-superio-it89-device.h index ab3757361..427c39fd8 100644 --- a/plugins/superio/fu-superio-it89-device.h +++ b/plugins/superio/fu-superio-it89-device.h @@ -8,9 +8,5 @@ #include "fu-superio-device.h" -G_BEGIN_DECLS - #define FU_TYPE_SUPERIO_IT89_DEVICE (fu_superio_it89_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSuperioIt89Device, fu_superio_it89_device, FU, SUPERIO_IT89_DEVICE, FuSuperioDevice) - -G_END_DECLS diff --git a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.h b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.h index a0b7f4f3f..bdda8d57e 100644 --- a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.h +++ b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPTICS_CXAUDIO_DEVICE (fu_synaptics_cxaudio_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapticsCxaudioDevice, fu_synaptics_cxaudio_device, FU, SYNAPTICS_CXAUDIO_DEVICE, FuUsbDevice) @@ -17,5 +15,3 @@ struct _FuSynapticsCxaudioDeviceClass { FuUsbDeviceClass parent_class; }; - -G_END_DECLS diff --git a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.h b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.h index 4f9e70bf2..f61526f8e 100644 --- a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.h +++ b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.h @@ -10,8 +10,6 @@ #include "fu-srec-firmware.h" #include "fu-synaptics-cxaudio-common.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPTICS_CXAUDIO_FIRMWARE (fu_synaptics_cxaudio_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapticsCxaudioFirmware, fu_synaptics_cxaudio_firmware, FU, SYNAPTICS_CXAUDIO_FIRMWARE, FuSrecFirmware) @@ -32,5 +30,3 @@ FuFirmware *fu_synaptics_cxaudio_firmware_new (void); FuSynapticsCxaudioFileKind fu_synaptics_cxaudio_firmware_get_file_type (FuSynapticsCxaudioFirmware *self); FuSynapticsCxaudioDeviceKind fu_synaptics_cxaudio_firmware_get_devtype (FuSynapticsCxaudioFirmware *self); guint8 fu_synaptics_cxaudio_firmware_get_layout_version (FuSynapticsCxaudioFirmware *self); - -G_END_DECLS diff --git a/plugins/synaptics-prometheus/fu-synaprom-config.h b/plugins/synaptics-prometheus/fu-synaprom-config.h index 6d08bcde2..c5f12ddaa 100644 --- a/plugins/synaptics-prometheus/fu-synaprom-config.h +++ b/plugins/synaptics-prometheus/fu-synaprom-config.h @@ -10,11 +10,7 @@ #include "fu-plugin.h" #include "fu-synaprom-device.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPROM_CONFIG (fu_synaprom_config_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapromConfig, fu_synaprom_config, FU, SYNAPROM_CONFIG, FuDevice) FuSynapromConfig *fu_synaprom_config_new (FuSynapromDevice *device); - -G_END_DECLS diff --git a/plugins/synaptics-prometheus/fu-synaprom-device.h b/plugins/synaptics-prometheus/fu-synaprom-device.h index e363715e9..668887879 100644 --- a/plugins/synaptics-prometheus/fu-synaprom-device.h +++ b/plugins/synaptics-prometheus/fu-synaprom-device.h @@ -9,8 +9,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPROM_DEVICE (fu_synaprom_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapromDevice, fu_synaprom_device, FU, SYNAPROM_DEVICE, FuUsbDevice) @@ -41,5 +39,3 @@ FuFirmware *fu_synaprom_device_prepare_fw (FuDevice *device, GBytes *fw, FwupdInstallFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/synaptics-prometheus/fu-synaprom-firmware.h b/plugins/synaptics-prometheus/fu-synaprom-firmware.h index 96a8f80ec..515e86056 100644 --- a/plugins/synaptics-prometheus/fu-synaprom-firmware.h +++ b/plugins/synaptics-prometheus/fu-synaprom-firmware.h @@ -9,8 +9,6 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPROM_FIRMWARE (fu_synaprom_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapromFirmware, fu_synaprom_firmware, FU, SYNAPROM_FIRMWARE, FuFirmware) @@ -40,5 +38,3 @@ typedef struct __attribute__((packed)) { } FuSynapromFirmwareCfgHeader; FuFirmware *fu_synaprom_firmware_new (void); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-common.h b/plugins/synaptics-rmi/fu-synaptics-rmi-common.h index 715abfd2c..362bd2526 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-common.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-common.h @@ -10,8 +10,6 @@ #include -G_BEGIN_DECLS - #define RMI_PRODUCT_ID_LENGTH 10 #define RMI_DEVICE_PDT_ENTRY_SIZE 6 @@ -36,5 +34,3 @@ FuSynapticsRmiFunction *fu_synaptics_rmi_function_parse (GByteArray *buf, gboolean fu_synaptics_rmi_device_writeln (const gchar *fn, const gchar *buf, GError **error); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-device.h b/plugins/synaptics-rmi/fu-synaptics-rmi-device.h index 4e4f64cab..058ca942a 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-device.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-device.h @@ -9,8 +9,6 @@ #include "fu-synaptics-rmi-common.h" #include "fu-udev-device.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPTICS_RMI_DEVICE (fu_synaptics_rmi_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuSynapticsRmiDevice, fu_synaptics_rmi_device, FU, SYNAPTICS_RMI_DEVICE, FuUdevDevice) @@ -76,5 +74,3 @@ gboolean fu_synaptics_rmi_device_rebind_driver (FuSynapticsRmiDevice *self, GError **error); gboolean fu_synaptics_rmi_device_poll_wait (FuSynapticsRmiDevice *self, GError **error); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-firmware.h b/plugins/synaptics-rmi/fu-synaptics-rmi-firmware.h index 4908d084f..2526fe46b 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-firmware.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-firmware.h @@ -8,13 +8,9 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPTICS_RMI_FIRMWARE (fu_synaptics_rmi_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapticsRmiFirmware, fu_synaptics_rmi_firmware, FU, SYNAPTICS_RMI_FIRMWARE, FuFirmware) FuFirmware *fu_synaptics_rmi_firmware_new (void); GBytes *fu_synaptics_rmi_firmware_generate_v0x (void); GBytes *fu_synaptics_rmi_firmware_generate_v10 (void); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-v5-device.h b/plugins/synaptics-rmi/fu-synaptics-rmi-v5-device.h index d9e8c6959..b979b0981 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-v5-device.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-v5-device.h @@ -10,8 +10,6 @@ #include "fu-synaptics-rmi-device.h" -G_BEGIN_DECLS - gboolean fu_synaptics_rmi_v5_device_detach (FuDevice *device, GError **error); gboolean fu_synaptics_rmi_v5_device_write_firmware (FuDevice *device, @@ -22,5 +20,3 @@ gboolean fu_synaptics_rmi_v5_device_setup (FuSynapticsRmiDevice *self, GError **error); gboolean fu_synaptics_rmi_v5_device_query_status (FuSynapticsRmiDevice *self, GError **error); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-v6-device.h b/plugins/synaptics-rmi/fu-synaptics-rmi-v6-device.h index ea369bf0a..331ae2b61 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-v6-device.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-v6-device.h @@ -10,9 +10,5 @@ #include "fu-synaptics-rmi-device.h" -G_BEGIN_DECLS - gboolean fu_synaptics_rmi_v6_device_setup (FuSynapticsRmiDevice *self, GError **error); - -G_END_DECLS diff --git a/plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.h b/plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.h index 4d84496fe..b71d0f98b 100644 --- a/plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.h +++ b/plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.h @@ -10,8 +10,6 @@ #include "fu-synaptics-rmi-device.h" -G_BEGIN_DECLS - gboolean fu_synaptics_rmi_v7_device_detach (FuDevice *device, GError **error); gboolean fu_synaptics_rmi_v7_device_write_firmware (FuDevice *device, @@ -22,5 +20,3 @@ gboolean fu_synaptics_rmi_v7_device_setup (FuSynapticsRmiDevice *self, GError **error); gboolean fu_synaptics_rmi_v7_device_query_status (FuSynapticsRmiDevice *self, GError **error); - -G_END_DECLS diff --git a/plugins/synapticsmst/fu-synapticsmst-device.h b/plugins/synapticsmst/fu-synapticsmst-device.h index cdc0f7761..8f0cc3efe 100644 --- a/plugins/synapticsmst/fu-synapticsmst-device.h +++ b/plugins/synapticsmst/fu-synapticsmst-device.h @@ -8,13 +8,9 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_SYNAPTICSMST_DEVICE (fu_synapticsmst_device_get_type ()) G_DECLARE_FINAL_TYPE (FuSynapticsmstDevice, fu_synapticsmst_device, FU, SYNAPTICSMST_DEVICE, FuUdevDevice) FuSynapticsmstDevice *fu_synapticsmst_device_new (FuUdevDevice *device); void fu_synapticsmst_device_set_system_type (FuSynapticsmstDevice *self, const gchar *system_type); - -G_END_DECLS diff --git a/plugins/thelio-io/fu-thelio-io-device.h b/plugins/thelio-io/fu-thelio-io-device.h index 1665a6df5..03b48f416 100644 --- a/plugins/thelio-io/fu-thelio-io-device.h +++ b/plugins/thelio-io/fu-thelio-io-device.h @@ -9,9 +9,5 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_THELIO_IO_DEVICE (fu_thelio_io_device_get_type ()) G_DECLARE_FINAL_TYPE (FuThelioIoDevice, fu_thelio_io_device, FU, THELIO_IO_DEVICE, FuUsbDevice) - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-bgrt.h b/plugins/uefi/fu-uefi-bgrt.h index 952bb8206..96898c942 100644 --- a/plugins/uefi/fu-uefi-bgrt.h +++ b/plugins/uefi/fu-uefi-bgrt.h @@ -6,8 +6,6 @@ #pragma once -G_BEGIN_DECLS - #define FU_TYPE_UEFI_BGRT (fu_uefi_bgrt_get_type ()) G_DECLARE_FINAL_TYPE (FuUefiBgrt, fu_uefi_bgrt, FU, UEFI_BGRT, GObject) @@ -19,5 +17,3 @@ guint32 fu_uefi_bgrt_get_xoffset (FuUefiBgrt *self); guint32 fu_uefi_bgrt_get_yoffset (FuUefiBgrt *self); guint32 fu_uefi_bgrt_get_width (FuUefiBgrt *self); guint32 fu_uefi_bgrt_get_height (FuUefiBgrt *self); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-bootmgr.h b/plugins/uefi/fu-uefi-bootmgr.h index 012d905fd..eda193c55 100644 --- a/plugins/uefi/fu-uefi-bootmgr.h +++ b/plugins/uefi/fu-uefi-bootmgr.h @@ -10,8 +10,6 @@ #include #include -G_BEGIN_DECLS - typedef enum { FU_UEFI_BOOTMGR_FLAG_NONE = 0, FU_UEFI_BOOTMGR_FLAG_USE_SHIM_FOR_SB = 1 << 0, @@ -23,5 +21,3 @@ gboolean fu_uefi_bootmgr_bootnext (const gchar *esp_path, const gchar *description, FuUefiBootmgrFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-common.h b/plugins/uefi/fu-uefi-common.h index 50a26b491..1617a0f30 100644 --- a/plugins/uefi/fu-uefi-common.h +++ b/plugins/uefi/fu-uefi-common.h @@ -10,8 +10,6 @@ #include #include -G_BEGIN_DECLS - #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET 0x00010000 #define EFI_CAPSULE_HEADER_FLAGS_POPULATE_SYSTEM_TABLE 0x00020000 #define EFI_CAPSULE_HEADER_FLAGS_INITIATE_RESET 0x00040000 @@ -84,5 +82,3 @@ GPtrArray *fu_uefi_get_esrt_entry_paths (const gchar *esrt_path, guint64 fu_uefi_read_file_as_uint64 (const gchar *path, const gchar *attr_name); void fu_uefi_print_efivar_errors (void); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-device.h b/plugins/uefi/fu-uefi-device.h index e65de5377..8a771d096 100644 --- a/plugins/uefi/fu-uefi-device.h +++ b/plugins/uefi/fu-uefi-device.h @@ -11,8 +11,6 @@ #include "fu-uefi-device.h" #include "fu-uefi-update-info.h" -G_BEGIN_DECLS - #define FU_TYPE_UEFI_DEVICE (fu_uefi_device_get_type ()) G_DECLARE_FINAL_TYPE (FuUefiDevice, fu_uefi_device, FU, UEFI_DEVICE, FuDevice) @@ -62,5 +60,3 @@ gboolean fu_uefi_device_write_update_info (FuUefiDevice *self, const gchar *varname, const efi_guid_t *guid, GError **error); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-devpath.h b/plugins/uefi/fu-uefi-devpath.h index e160d731d..eb2f906c9 100644 --- a/plugins/uefi/fu-uefi-devpath.h +++ b/plugins/uefi/fu-uefi-devpath.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - typedef enum { FU_UEFI_DEVPATH_PARSE_FLAG_NONE = 0, FU_UEFI_DEVPATH_PARSE_FLAG_REPAIR = 1 << 0, @@ -24,5 +22,3 @@ GBytes *fu_uefi_devpath_find_data (GPtrArray *dps, guint8 type, guint8 subtype, GError **error); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-pcrs.h b/plugins/uefi/fu-uefi-pcrs.h index 01c0043ec..67ff353f8 100644 --- a/plugins/uefi/fu-uefi-pcrs.h +++ b/plugins/uefi/fu-uefi-pcrs.h @@ -6,8 +6,6 @@ #pragma once -G_BEGIN_DECLS - #define FU_TYPE_UEFI_PCRS (fu_uefi_pcrs_get_type ()) G_DECLARE_FINAL_TYPE (FuUefiPcrs, fu_uefi_pcrs, FU, UEFI_PCRS, GObject) @@ -16,5 +14,3 @@ gboolean fu_uefi_pcrs_setup (FuUefiPcrs *self, GError **error); GPtrArray *fu_uefi_pcrs_get_checksums (FuUefiPcrs *self, guint idx); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-update-info.h b/plugins/uefi/fu-uefi-update-info.h index 4c853a6a8..89b2afa98 100644 --- a/plugins/uefi/fu-uefi-update-info.h +++ b/plugins/uefi/fu-uefi-update-info.h @@ -6,8 +6,6 @@ #pragma once -G_BEGIN_DECLS - #define FU_TYPE_UEFI_UPDATE_INFO (fu_uefi_update_info_get_type ()) G_DECLARE_FINAL_TYPE (FuUefiUpdateInfo, fu_uefi_update_info, FU, UEFI_UPDATE_INFO, GObject) @@ -29,5 +27,3 @@ const gchar *fu_uefi_update_info_get_capsule_fn (FuUefiUpdateInfo *self); guint32 fu_uefi_update_info_get_capsule_flags (FuUefiUpdateInfo *self); guint64 fu_uefi_update_info_get_hw_inst (FuUefiUpdateInfo *self); FuUefiUpdateInfoStatus fu_uefi_update_info_get_status (FuUefiUpdateInfo *self); - -G_END_DECLS diff --git a/plugins/uefi/fu-uefi-vars.h b/plugins/uefi/fu-uefi-vars.h index 04cffa74e..adcd3e7f0 100644 --- a/plugins/uefi/fu-uefi-vars.h +++ b/plugins/uefi/fu-uefi-vars.h @@ -9,8 +9,6 @@ #include -G_BEGIN_DECLS - #define FU_UEFI_VARS_GUID_EFI_GLOBAL "8be4df61-93ca-11d2-aa0d-00e098032b8c" #define FU_UEFI_VARS_GUID_FWUPDATE "0abba7dc-e516-4167-bbf5-4d9d1c739416" #define FU_UEFI_VARS_GUID_UX_CAPSULE "3b8c8162-188c-46a4-aec9-be43f1d65697" @@ -44,5 +42,3 @@ gboolean fu_uefi_vars_delete (const gchar *guid, gboolean fu_uefi_vars_delete_with_glob (const gchar *guid, const gchar *name_glob, GError **error); - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-bootloader-nordic.h b/plugins/unifying/fu-unifying-bootloader-nordic.h index 2e77ccb7f..8f46a8416 100644 --- a/plugins/unifying/fu-unifying-bootloader-nordic.h +++ b/plugins/unifying/fu-unifying-bootloader-nordic.h @@ -8,9 +8,5 @@ #include "fu-unifying-bootloader.h" -G_BEGIN_DECLS - #define FU_TYPE_UNIFYING_BOOTLOADER_NORDIC (fu_unifying_bootloader_nordic_get_type ()) G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderNordic, fu_unifying_bootloader_nordic, FU, UNIFYING_BOOTLOADER_NORDIC, FuUnifyingBootloader) - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-bootloader-texas.h b/plugins/unifying/fu-unifying-bootloader-texas.h index c68acd2e4..ecfba14a9 100644 --- a/plugins/unifying/fu-unifying-bootloader-texas.h +++ b/plugins/unifying/fu-unifying-bootloader-texas.h @@ -8,9 +8,5 @@ #include "fu-unifying-bootloader.h" -G_BEGIN_DECLS - #define FU_TYPE_UNIFYING_BOOTLOADER_TEXAS (fu_unifying_bootloader_texas_get_type ()) G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderTexas, fu_unifying_bootloader_texas, FU, UNIFYING_BOOTLOADER_TEXAS, FuUnifyingBootloader) - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-bootloader.h b/plugins/unifying/fu-unifying-bootloader.h index 60bb50b1b..460d5c742 100644 --- a/plugins/unifying/fu-unifying-bootloader.h +++ b/plugins/unifying/fu-unifying-bootloader.h @@ -8,8 +8,6 @@ #include "fu-usb-device.h" -G_BEGIN_DECLS - #define FU_TYPE_UNIFYING_BOOTLOADER (fu_unifying_bootloader_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuUnifyingBootloader, fu_unifying_bootloader, FU, UNIFYING_BOOTLOADER, FuUsbDevice) @@ -76,5 +74,3 @@ gboolean fu_unifying_bootloader_request (FuUnifyingBootloader *self, guint16 fu_unifying_bootloader_get_addr_lo (FuUnifyingBootloader *self); guint16 fu_unifying_bootloader_get_addr_hi (FuUnifyingBootloader *self); guint16 fu_unifying_bootloader_get_blocksize (FuUnifyingBootloader *self); - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-common.h b/plugins/unifying/fu-unifying-common.h index 413d553e5..e33f27f42 100644 --- a/plugins/unifying/fu-unifying-common.h +++ b/plugins/unifying/fu-unifying-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_UNIFYING_DEVICE_VID 0x046d #define FU_UNIFYING_DEVICE_PID_RUNTIME 0xc52b @@ -28,5 +26,3 @@ gchar *fu_unifying_format_version (const gchar *name, guint8 major, guint8 minor, guint16 build); - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-hidpp-msg.h b/plugins/unifying/fu-unifying-hidpp-msg.h index 931bb382d..2a098d0c1 100644 --- a/plugins/unifying/fu-unifying-hidpp-msg.h +++ b/plugins/unifying/fu-unifying-hidpp-msg.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - typedef enum { FU_UNIFYING_HIDPP_MSG_FLAG_NONE, FU_UNIFYING_HIDPP_MSG_FLAG_LONGER_TIMEOUT = 1 << 0, @@ -54,5 +52,3 @@ const gchar *fu_unifying_hidpp_msg_dev_id_to_string (FuUnifyingHidppMsg *msg); const gchar *fu_unifying_hidpp_msg_rpt_id_to_string (FuUnifyingHidppMsg *msg); const gchar *fu_unifying_hidpp_msg_sub_id_to_string (FuUnifyingHidppMsg *msg); const gchar *fu_unifying_hidpp_msg_fcn_id_to_string (FuUnifyingHidppMsg *msg); - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-hidpp.h b/plugins/unifying/fu-unifying-hidpp.h index 689f8577d..47d818cc1 100644 --- a/plugins/unifying/fu-unifying-hidpp.h +++ b/plugins/unifying/fu-unifying-hidpp.h @@ -10,8 +10,6 @@ #include "fu-io-channel.h" -G_BEGIN_DECLS - /* * Based on the HID++ documentation provided by Nestor Lopez Casado at: * https://drive.google.com/folderview?id=0BxbRzx7vEV7eWmgwazJ3NUFfQ28&usp=sharing @@ -148,5 +146,3 @@ gboolean fu_unifying_hidpp_receive (FuIOChannel *self, gboolean fu_unifying_hidpp_transfer (FuIOChannel *self, FuUnifyingHidppMsg *msg, GError **error); - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-peripheral.h b/plugins/unifying/fu-unifying-peripheral.h index fe5a9d7a2..36b0bfff8 100644 --- a/plugins/unifying/fu-unifying-peripheral.h +++ b/plugins/unifying/fu-unifying-peripheral.h @@ -8,9 +8,5 @@ #include "fu-udev-device.h" -G_BEGIN_DECLS - #define FU_TYPE_UNIFYING_PERIPHERAL (fu_unifying_peripheral_get_type ()) G_DECLARE_FINAL_TYPE (FuUnifyingPeripheral, fu_unifying_peripheral, FU, UNIFYING_PERIPHERAL, FuUdevDevice) - -G_END_DECLS diff --git a/plugins/unifying/fu-unifying-runtime.h b/plugins/unifying/fu-unifying-runtime.h index a3fa5b3b0..3b5332c87 100644 --- a/plugins/unifying/fu-unifying-runtime.h +++ b/plugins/unifying/fu-unifying-runtime.h @@ -8,9 +8,5 @@ #include "fu-udev-device.h" -G_BEGIN_DECLS - #define FU_TYPE_UNIFYING_RUNTIME (fu_unifying_runtime_get_type ()) G_DECLARE_FINAL_TYPE (FuUnifyingRuntime, fu_unifying_runtime, FU, UNIFYING_RUNTIME, FuUdevDevice) - -G_END_DECLS diff --git a/plugins/wacom-raw/fu-wacom-aes-device.h b/plugins/wacom-raw/fu-wacom-aes-device.h index 7334f5897..702c3bda2 100644 --- a/plugins/wacom-raw/fu-wacom-aes-device.h +++ b/plugins/wacom-raw/fu-wacom-aes-device.h @@ -8,11 +8,7 @@ #include "fu-wacom-device.h" -G_BEGIN_DECLS - #define FU_TYPE_WACOM_AES_DEVICE (fu_wacom_aes_device_get_type ()) G_DECLARE_FINAL_TYPE (FuWacomAesDevice, fu_wacom_aes_device, FU, WACOM_AES_DEVICE, FuWacomDevice) FuWacomAesDevice *fu_wacom_aes_device_new (FuUdevDevice *device); - -G_END_DECLS diff --git a/plugins/wacom-raw/fu-wacom-common.h b/plugins/wacom-raw/fu-wacom-common.h index 5e7150ad3..964fffdcc 100644 --- a/plugins/wacom-raw/fu-wacom-common.h +++ b/plugins/wacom-raw/fu-wacom-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_WACOM_RAW_CMD_RETRIES 1000 #define FU_WACOM_RAW_STATUS_REPORT_ID 0x04 @@ -72,5 +70,3 @@ gboolean fu_wacom_common_check_reply (const FuWacomRawRequest *req, GError **error); gboolean fu_wacom_common_block_is_empty (const guint8 *data, guint16 datasz); - -G_END_DECLS diff --git a/plugins/wacom-raw/fu-wacom-device.h b/plugins/wacom-raw/fu-wacom-device.h index ff0948c71..346b20e64 100644 --- a/plugins/wacom-raw/fu-wacom-device.h +++ b/plugins/wacom-raw/fu-wacom-device.h @@ -9,8 +9,6 @@ #include "fu-wacom-common.h" #include "fu-udev-device.h" -G_BEGIN_DECLS - #define FU_TYPE_WACOM_DEVICE (fu_wacom_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuWacomDevice, fu_wacom_device, FU, WACOM_DEVICE, FuUdevDevice) @@ -48,5 +46,3 @@ gboolean fu_wacom_device_check_mpu (FuWacomDevice *self, GError **error); guint fu_wacom_device_get_block_sz (FuWacomDevice *self); guint fu_wacom_device_get_base_addr (FuWacomDevice *self); - -G_END_DECLS diff --git a/plugins/wacom-raw/fu-wacom-emr-device.h b/plugins/wacom-raw/fu-wacom-emr-device.h index 6cc00257e..e054b632f 100644 --- a/plugins/wacom-raw/fu-wacom-emr-device.h +++ b/plugins/wacom-raw/fu-wacom-emr-device.h @@ -8,11 +8,7 @@ #include "fu-wacom-device.h" -G_BEGIN_DECLS - #define FU_TYPE_WACOM_EMR_DEVICE (fu_wacom_emr_device_get_type ()) G_DECLARE_FINAL_TYPE (FuWacomEmrDevice, fu_wacom_emr_device, FU, WACOM_EMR_DEVICE, FuUdevDevice) FuWacomEmrDevice *fu_wacom_emr_device_new (FuUdevDevice *device); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-common.h b/plugins/wacom-usb/fu-wac-common.h index 7cdfc4b6f..fe8d9d9bc 100644 --- a/plugins/wacom-usb/fu-wac-common.h +++ b/plugins/wacom-usb/fu-wac-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_WAC_PACKET_LEN 512 #define FU_WAC_REPORT_ID_COMMAND 0x01 @@ -47,5 +45,3 @@ void fu_wac_buffer_dump (const gchar *title, guint8 cmd, const guint8 *buf, gsize sz); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-device.h b/plugins/wacom-usb/fu-wac-device.h index 9d9e5344b..5d2ac42d3 100644 --- a/plugins/wacom-usb/fu-wac-device.h +++ b/plugins/wacom-usb/fu-wac-device.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_WAC_DEVICE (fu_wac_device_get_type ()) G_DECLARE_FINAL_TYPE (FuWacDevice, fu_wac_device, FU, WAC_DEVICE, FuUsbDevice) @@ -32,5 +30,3 @@ gboolean fu_wac_device_set_feature_report (FuWacDevice *self, gsize bufsz, FuWacDeviceFeatureFlags flags, GError **error); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-firmware.h b/plugins/wacom-usb/fu-wac-firmware.h index 03d8c2b3b..dcc42c8f1 100644 --- a/plugins/wacom-usb/fu-wac-firmware.h +++ b/plugins/wacom-usb/fu-wac-firmware.h @@ -8,11 +8,7 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_WAC_FIRMWARE (fu_wac_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuWacFirmware, fu_wac_firmware, FU, WAC_FIRMWARE, FuFirmware) FuFirmware *fu_wac_firmware_new (void); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-module-bluetooth.h b/plugins/wacom-usb/fu-wac-module-bluetooth.h index d66d3f13d..a21317ba8 100644 --- a/plugins/wacom-usb/fu-wac-module-bluetooth.h +++ b/plugins/wacom-usb/fu-wac-module-bluetooth.h @@ -8,11 +8,7 @@ #include "fu-wac-module.h" -G_BEGIN_DECLS - #define FU_TYPE_WAC_MODULE_BLUETOOTH (fu_wac_module_bluetooth_get_type ()) G_DECLARE_FINAL_TYPE (FuWacModuleBluetooth, fu_wac_module_bluetooth, FU, WAC_MODULE_BLUETOOTH, FuWacModule) FuWacModule *fu_wac_module_bluetooth_new (GUsbDevice *usb_device); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-module-touch.h b/plugins/wacom-usb/fu-wac-module-touch.h index 53e9feff0..69bcb2b7f 100644 --- a/plugins/wacom-usb/fu-wac-module-touch.h +++ b/plugins/wacom-usb/fu-wac-module-touch.h @@ -8,11 +8,7 @@ #include "fu-wac-module.h" -G_BEGIN_DECLS - #define FU_TYPE_WAC_MODULE_TOUCH (fu_wac_module_touch_get_type ()) G_DECLARE_FINAL_TYPE (FuWacModuleTouch, fu_wac_module_touch, FU, WAC_MODULE_TOUCH, FuWacModule) FuWacModule *fu_wac_module_touch_new (GUsbDevice *usb_device); - -G_END_DECLS diff --git a/plugins/wacom-usb/fu-wac-module.h b/plugins/wacom-usb/fu-wac-module.h index 8dd09bb1b..7b8c4217f 100644 --- a/plugins/wacom-usb/fu-wac-module.h +++ b/plugins/wacom-usb/fu-wac-module.h @@ -8,8 +8,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_WAC_MODULE (fu_wac_module_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuWacModule, fu_wac_module, FU, WAC_MODULE, FuDevice) @@ -32,5 +30,3 @@ gboolean fu_wac_module_set_feature (FuWacModule *self, guint8 command, GBytes *blob, GError **error); - -G_END_DECLS diff --git a/src/fu-archive.h b/src/fu-archive.h index 641b6a8a5..485080e9e 100644 --- a/src/fu-archive.h +++ b/src/fu-archive.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_ARCHIVE (fu_archive_get_type ()) G_DECLARE_FINAL_TYPE (FuArchive, fu_archive, FU, ARCHIVE, GObject) @@ -51,5 +49,3 @@ GBytes *fu_archive_lookup_by_fn (FuArchive *self, void fu_archive_iterate (FuArchive *self, FuArchiveIterateFunc callback, gpointer user_data); - -G_END_DECLS diff --git a/src/fu-chunk.h b/src/fu-chunk.h index 9cde630cf..5b1ca2a00 100644 --- a/src/fu-chunk.h +++ b/src/fu-chunk.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - typedef struct { guint32 idx; guint32 page; @@ -36,5 +34,3 @@ GPtrArray *fu_chunk_array_new_from_bytes (GBytes *blob, guint32 addr_start, guint32 page_sz, guint32 packet_sz); - -G_END_DECLS diff --git a/src/fu-common-cab.h b/src/fu-common-cab.h index f5a306e32..daaef1e4e 100644 --- a/src/fu-common-cab.h +++ b/src/fu-common-cab.h @@ -8,10 +8,6 @@ #include -G_BEGIN_DECLS - XbSilo *fu_common_cab_build_silo (GBytes *blob, guint64 size_max, GError **error); - -G_END_DECLS diff --git a/src/fu-common-guid.h b/src/fu-common-guid.h index 4e6e2b40b..16c9b86c0 100644 --- a/src/fu-common-guid.h +++ b/src/fu-common-guid.h @@ -8,8 +8,4 @@ #include -G_BEGIN_DECLS - gboolean fu_common_guid_is_plausible (const guint8 *buf); - -G_END_DECLS diff --git a/src/fu-common-version.h b/src/fu-common-version.h index 7899da2d5..4f32aef4a 100644 --- a/src/fu-common-version.h +++ b/src/fu-common-version.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - gint fu_common_vercmp (const gchar *version_a, const gchar *version_b); gchar *fu_common_version_from_uint32 (guint32 val, @@ -23,4 +21,3 @@ FwupdVersionFormat fu_common_version_guess_format (const gchar *version); gboolean fu_common_version_verify_format (const gchar *version, FwupdVersionFormat fmt, GError **error); -G_END_DECLS diff --git a/src/fu-common.h b/src/fu-common.h index 9eadf71d1..92c4511ed 100644 --- a/src/fu-common.h +++ b/src/fu-common.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - /** * FuAppFlags: * @FU_APP_FLAGS_NONE: No flags set @@ -195,5 +193,3 @@ gchar **fu_common_strnsplit (const gchar *str, gsize sz, const gchar *delimiter, gint max_tokens); - -G_END_DECLS diff --git a/src/fu-config.h b/src/fu-config.h index 25bdf1710..7b3a4b0b7 100644 --- a/src/fu-config.h +++ b/src/fu-config.h @@ -10,8 +10,6 @@ #include "fwupd-remote.h" -G_BEGIN_DECLS - #define FU_TYPE_CONFIG (fu_config_get_type ()) G_DECLARE_FINAL_TYPE (FuConfig, fu_config, FU, CONFIG, GObject) @@ -46,5 +44,3 @@ GPtrArray *fu_config_get_approved_firmware (FuConfig *self); GPtrArray *fu_config_get_remotes (FuConfig *self); FwupdRemote *fu_config_get_remote_by_id (FuConfig *self, const gchar *remote_id); - -G_END_DECLS diff --git a/src/fu-debug.h b/src/fu-debug.h index 6f61b714a..19dc5b40d 100644 --- a/src/fu-debug.h +++ b/src/fu-debug.h @@ -8,8 +8,4 @@ #include -G_BEGIN_DECLS - GOptionGroup *fu_debug_get_option_group (void); - -G_END_DECLS diff --git a/src/fu-device-list.h b/src/fu-device-list.h index 023ac0552..783b9d765 100644 --- a/src/fu-device-list.h +++ b/src/fu-device-list.h @@ -10,8 +10,6 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_DEVICE_LIST (fu_device_list_get_type ()) G_DECLARE_FINAL_TYPE (FuDeviceList, fu_device_list, FU, DEVICE_LIST, GObject) @@ -33,5 +31,3 @@ FuDevice *fu_device_list_get_by_guid (FuDeviceList *self, gboolean fu_device_list_wait_for_replug (FuDeviceList *self, FuDevice *device, GError **error); - -G_END_DECLS diff --git a/src/fu-device-locker.h b/src/fu-device-locker.h index 16c1cbb6f..f0504fd91 100644 --- a/src/fu-device-locker.h +++ b/src/fu-device-locker.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_DEVICE_LOCKER (fu_device_locker_get_type ()) G_DECLARE_FINAL_TYPE (FuDeviceLocker, fu_device_locker, FU, DEVICE_LOCKER, GObject) @@ -23,5 +21,3 @@ FuDeviceLocker *fu_device_locker_new_full (gpointer device, FuDeviceLockerFunc open_func, FuDeviceLockerFunc close_func, GError **error); - -G_END_DECLS diff --git a/src/fu-device-metadata.h b/src/fu-device-metadata.h index 9ccf3a002..d81b5301f 100644 --- a/src/fu-device-metadata.h +++ b/src/fu-device-metadata.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - /** * SECTION:fu-device-metadata * @short_description: a device helper object @@ -63,5 +61,3 @@ G_BEGIN_DECLS * need to be handled as a capsule update. */ #define FU_DEVICE_METADATA_UEFI_CAPSULE_FLAGS "UefiCapsuleFlags" - -G_END_DECLS diff --git a/src/fu-device-private.h b/src/fu-device-private.h index d21b95115..bd1c6eb60 100644 --- a/src/fu-device-private.h +++ b/src/fu-device-private.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - /** * FuDeviceInstanceFlags: * @FU_DEVICE_INSTANCE_FLAG_NONE: No flags set @@ -48,5 +46,3 @@ void fu_device_add_instance_id_full (FuDevice *self, const gchar *instance_id, FuDeviceInstanceFlags flags); gchar *fu_device_get_guids_as_str (FuDevice *self); - -G_END_DECLS diff --git a/src/fu-device.h b/src/fu-device.h index a411ec3bf..f0b233813 100644 --- a/src/fu-device.h +++ b/src/fu-device.h @@ -13,8 +13,6 @@ #include "fu-quirks.h" #include "fu-common-version.h" -G_BEGIN_DECLS - #define FU_TYPE_DEVICE (fu_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuDevice, fu_device, FU, DEVICE, FwupdDevice) @@ -247,5 +245,3 @@ gboolean fu_device_poll (FuDevice *self, GError **error); void fu_device_set_poll_interval (FuDevice *self, guint interval); - -G_END_DECLS diff --git a/src/fu-engine.h b/src/fu-engine.h index f02dca219..c7f4d5a62 100644 --- a/src/fu-engine.h +++ b/src/fu-engine.h @@ -17,8 +17,6 @@ #include "fu-install-task.h" #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_ENGINE (fu_engine_get_type ()) G_DECLARE_FINAL_TYPE (FuEngine, fu_engine, FU, ENGINE, GObject) @@ -163,5 +161,3 @@ void fu_engine_set_silo (FuEngine *self, XbSilo *silo); XbNode *fu_engine_get_component_by_guids (FuEngine *self, FuDevice *device); - -G_END_DECLS diff --git a/src/fu-firmware-common.h b/src/fu-firmware-common.h index 6aa25c82d..0887b20b4 100644 --- a/src/fu-firmware-common.h +++ b/src/fu-firmware-common.h @@ -8,12 +8,8 @@ #include -G_BEGIN_DECLS - guint8 fu_firmware_strparse_uint4 (const gchar *data); guint8 fu_firmware_strparse_uint8 (const gchar *data); guint16 fu_firmware_strparse_uint16 (const gchar *data); guint32 fu_firmware_strparse_uint24 (const gchar *data); guint32 fu_firmware_strparse_uint32 (const gchar *data); - -G_END_DECLS diff --git a/src/fu-firmware-image-private.h b/src/fu-firmware-image-private.h index abd84003f..708e335e9 100644 --- a/src/fu-firmware-image-private.h +++ b/src/fu-firmware-image-private.h @@ -8,10 +8,6 @@ #include "fu-firmware-image.h" -G_BEGIN_DECLS - void fu_firmware_image_add_string (FuFirmwareImage *self, guint idt, GString *str); - -G_END_DECLS diff --git a/src/fu-firmware-image.h b/src/fu-firmware-image.h index 826311676..0d2d71752 100644 --- a/src/fu-firmware-image.h +++ b/src/fu-firmware-image.h @@ -9,8 +9,6 @@ #include #include -G_BEGIN_DECLS - #define FU_TYPE_FIRMWARE_IMAGE (fu_firmware_image_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuFirmwareImage, fu_firmware_image, FU, FIRMWARE_IMAGE, GObject) @@ -45,5 +43,3 @@ GBytes *fu_firmware_image_get_bytes_chunk(FuFirmwareImage *self, guint64 address, guint64 chunk_sz_max, GError **error); - -G_END_DECLS diff --git a/src/fu-firmware.h b/src/fu-firmware.h index df137d648..c080a4b1d 100644 --- a/src/fu-firmware.h +++ b/src/fu-firmware.h @@ -11,8 +11,6 @@ #include "fu-firmware-image.h" -G_BEGIN_DECLS - #define FU_TYPE_FIRMWARE (fu_firmware_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuFirmware, fu_firmware, FU, FIRMWARE, GObject) @@ -78,5 +76,3 @@ FuFirmwareImage *fu_firmware_get_image_default (FuFirmware *self, GError **error); GBytes *fu_firmware_get_image_default_bytes (FuFirmware *self, GError **error); - -G_END_DECLS diff --git a/src/fu-history.h b/src/fu-history.h index b3ec97738..d25aa601c 100644 --- a/src/fu-history.h +++ b/src/fu-history.h @@ -10,8 +10,6 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_PENDING (fu_history_get_type ()) G_DECLARE_FINAL_TYPE (FuHistory, fu_history, FU, HISTORY, GObject) @@ -63,5 +61,3 @@ gboolean fu_history_add_approved_firmware (FuHistory *self, GError **error); GPtrArray *fu_history_get_approved_firmware (FuHistory *self, GError **error); - -G_END_DECLS diff --git a/src/fu-hwids.h b/src/fu-hwids.h index 2c98a7678..61de7fd03 100644 --- a/src/fu-hwids.h +++ b/src/fu-hwids.h @@ -10,8 +10,6 @@ #include "fu-smbios.h" -G_BEGIN_DECLS - #define FU_TYPE_HWIDS (fu_hwids_get_type ()) G_DECLARE_FINAL_TYPE (FuHwids, fu_hwids, FU, HWIDS, GObject) @@ -46,5 +44,3 @@ gboolean fu_hwids_has_guid (FuHwids *self, gboolean fu_hwids_setup (FuHwids *self, FuSmbios *smbios, GError **error); - -G_END_DECLS diff --git a/src/fu-idle.h b/src/fu-idle.h index a44debf7c..cf5cbe152 100644 --- a/src/fu-idle.h +++ b/src/fu-idle.h @@ -11,8 +11,6 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_IDLE (fu_idle_get_type ()) G_DECLARE_FINAL_TYPE (FuIdle, fu_idle, FU, IDLE, GObject) @@ -43,5 +41,3 @@ FuIdleLocker *fu_idle_locker_new (FuIdle *self, void fu_idle_locker_free (FuIdleLocker *locker); G_DEFINE_AUTOPTR_CLEANUP_FUNC(FuIdleLocker, fu_idle_locker_free) - -G_END_DECLS diff --git a/src/fu-ihex-firmware.h b/src/fu-ihex-firmware.h index ad90137ac..4632d7346 100644 --- a/src/fu-ihex-firmware.h +++ b/src/fu-ihex-firmware.h @@ -8,11 +8,7 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_IHEX_FIRMWARE (fu_ihex_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuIhexFirmware, fu_ihex_firmware, FU, IHEX_FIRMWARE, FuFirmware) FuFirmware *fu_ihex_firmware_new (void); - -G_END_DECLS diff --git a/src/fu-install-task.h b/src/fu-install-task.h index bd0d0ec2d..e9e03c337 100644 --- a/src/fu-install-task.h +++ b/src/fu-install-task.h @@ -11,8 +11,6 @@ #include "fu-device.h" -G_BEGIN_DECLS - #define FU_TYPE_TASK (fu_install_task_get_type ()) G_DECLARE_FINAL_TYPE (FuInstallTask, fu_install_task, FU, INSTALL_TASK, GObject) @@ -28,5 +26,3 @@ gboolean fu_install_task_check_requirements (FuInstallTask *self, const gchar *fu_install_task_get_action_id (FuInstallTask *self); gint fu_install_task_compare (FuInstallTask *task1, FuInstallTask *task2); - -G_END_DECLS diff --git a/src/fu-io-channel.h b/src/fu-io-channel.h index bd5d91ee7..a4f9d6b32 100644 --- a/src/fu-io-channel.h +++ b/src/fu-io-channel.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_IO_CHANNEL (fu_io_channel_get_type ()) G_DECLARE_FINAL_TYPE (FuIOChannel, fu_io_channel, FU, IO_CHANNEL, GObject) @@ -72,5 +70,3 @@ GByteArray *fu_io_channel_read_byte_array (FuIOChannel *self, guint timeout_ms, FuIOChannelFlags flags, GError **error); - -G_END_DECLS diff --git a/src/fu-keyring-gpg.h b/src/fu-keyring-gpg.h index b3857525d..8c5c7f89d 100644 --- a/src/fu-keyring-gpg.h +++ b/src/fu-keyring-gpg.h @@ -8,12 +8,8 @@ #include "fu-keyring.h" -G_BEGIN_DECLS - #define FU_TYPE_KEYRING_GPG (fu_keyring_gpg_get_type ()) G_DECLARE_FINAL_TYPE (FuKeyringGpg, fu_keyring_gpg, FU, KEYRING_GPG, FuKeyring) FuKeyring *fu_keyring_gpg_new (void); - -G_END_DECLS diff --git a/src/fu-keyring-pkcs7.h b/src/fu-keyring-pkcs7.h index 19b6cd2ff..eda168f27 100644 --- a/src/fu-keyring-pkcs7.h +++ b/src/fu-keyring-pkcs7.h @@ -8,12 +8,8 @@ #include "fu-keyring.h" -G_BEGIN_DECLS - #define FU_TYPE_KEYRING_PKCS7 (fu_keyring_pkcs7_get_type ()) G_DECLARE_FINAL_TYPE (FuKeyringPkcs7, fu_keyring_pkcs7, FU, KEYRING_PKCS7, FuKeyring) FuKeyring *fu_keyring_pkcs7_new (void); - -G_END_DECLS diff --git a/src/fu-keyring-result.h b/src/fu-keyring-result.h index 2216fad10..14a5acd29 100644 --- a/src/fu-keyring-result.h +++ b/src/fu-keyring-result.h @@ -8,13 +8,9 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_KEYRING_RESULT (fu_keyring_result_get_type ()) G_DECLARE_FINAL_TYPE (FuKeyringResult, fu_keyring_result, FU, KEYRING_RESULT, GObject) gint64 fu_keyring_result_get_timestamp (FuKeyringResult *self); const gchar *fu_keyring_result_get_authority (FuKeyringResult *self); - -G_END_DECLS diff --git a/src/fu-keyring-utils.h b/src/fu-keyring-utils.h index 4b955ace0..5a95b2d26 100644 --- a/src/fu-keyring-utils.h +++ b/src/fu-keyring-utils.h @@ -11,12 +11,8 @@ #include "fu-keyring.h" #include "fwupd-enums.h" -G_BEGIN_DECLS - FuKeyring *fu_keyring_create_for_kind (FwupdKeyringKind kind, GError **error); gboolean fu_keyring_get_release_flags (XbNode *release, FwupdReleaseFlags *flags, GError **error); - -G_END_DECLS diff --git a/src/fu-keyring.h b/src/fu-keyring.h index 2f20e35e1..beca1a6c6 100644 --- a/src/fu-keyring.h +++ b/src/fu-keyring.h @@ -11,8 +11,6 @@ #include "fu-keyring-result.h" -G_BEGIN_DECLS - #define FU_TYPE_KEYRING (fu_keyring_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuKeyring, fu_keyring, FU, KEYRING, GObject) @@ -84,5 +82,3 @@ GBytes *fu_keyring_sign_data (FuKeyring *keyring, const gchar *fu_keyring_get_name (FuKeyring *self); void fu_keyring_set_name (FuKeyring *self, const gchar *name); - -G_END_DECLS diff --git a/src/fu-mutex.h b/src/fu-mutex.h index 369e1d2f0..0d3755abd 100644 --- a/src/fu-mutex.h +++ b/src/fu-mutex.h @@ -9,8 +9,6 @@ #include -G_BEGIN_DECLS - #if !GLIB_CHECK_VERSION(2, 61, 1) /* Backported GRWLock autoptr support for older glib versions */ @@ -49,5 +47,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRWLockWriterLocker, g_rw_lock_writer_locker_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRWLockReaderLocker, g_rw_lock_reader_locker_free) #endif - -G_END_DECLS diff --git a/src/fu-plugin-list.h b/src/fu-plugin-list.h index 55ecac303..8161c5182 100644 --- a/src/fu-plugin-list.h +++ b/src/fu-plugin-list.h @@ -10,8 +10,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_PLUGIN_LIST (fu_plugin_list_get_type ()) G_DECLARE_FINAL_TYPE (FuPluginList, fu_plugin_list, FU, PLUGIN_LIST, GObject) @@ -24,5 +22,3 @@ FuPlugin *fu_plugin_list_find_by_name (FuPluginList *self, GError **error); gboolean fu_plugin_list_depsolve (FuPluginList *self, GError **error); - -G_END_DECLS diff --git a/src/fu-plugin-private.h b/src/fu-plugin-private.h index 11f6c4c8d..5aa6fa251 100644 --- a/src/fu-plugin-private.h +++ b/src/fu-plugin-private.h @@ -10,8 +10,6 @@ #include "fu-plugin.h" #include "fu-smbios.h" -G_BEGIN_DECLS - #define FU_OFFLINE_TRIGGER_FILENAME FU_OFFLINE_DESTDIR "/system-update" FuPlugin *fu_plugin_new (void); @@ -127,5 +125,3 @@ gint fu_plugin_order_compare (FuPlugin *plugin1, /* utils */ gchar *fu_plugin_guess_name_from_fn (const gchar *filename); - -G_END_DECLS diff --git a/src/fu-plugin-vfuncs.h b/src/fu-plugin-vfuncs.h index 88ce21b25..316351c9a 100644 --- a/src/fu-plugin-vfuncs.h +++ b/src/fu-plugin-vfuncs.h @@ -10,8 +10,6 @@ #include "fu-device.h" #include "fu-hash.h" -G_BEGIN_DECLS - void fu_plugin_init (FuPlugin *plugin); void fu_plugin_destroy (FuPlugin *plugin); gboolean fu_plugin_startup (FuPlugin *plugin, @@ -79,5 +77,3 @@ gboolean fu_plugin_device_removed (FuPlugin *plugin, GError **error); void fu_plugin_device_registered (FuPlugin *plugin, FuDevice *dev); - -G_END_DECLS diff --git a/src/fu-plugin.h b/src/fu-plugin.h index e2ac39d7d..e7935124e 100644 --- a/src/fu-plugin.h +++ b/src/fu-plugin.h @@ -21,8 +21,6 @@ #include "fu-udev-device.h" #include "fwupd-common.h" -G_BEGIN_DECLS - #define FU_TYPE_PLUGIN (fu_plugin_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuPlugin, fu_plugin, FU, PLUGIN, GObject) @@ -151,5 +149,3 @@ void fu_plugin_add_compile_version (FuPlugin *self, const gchar *version); gboolean fu_plugin_has_custom_flag (FuPlugin *self, const gchar *flag); - -G_END_DECLS diff --git a/src/fu-progressbar.h b/src/fu-progressbar.h index 3f2bbc6f6..caf675fec 100644 --- a/src/fu-progressbar.h +++ b/src/fu-progressbar.h @@ -10,8 +10,6 @@ #include "fwupd-enums.h" -G_BEGIN_DECLS - #define FU_TYPE_PROGRESSBAR (fu_progressbar_get_type ()) G_DECLARE_FINAL_TYPE (FuProgressbar, fu_progressbar, FU, PROGRESSBAR, GObject) @@ -27,5 +25,3 @@ void fu_progressbar_set_title (FuProgressbar *self, const gchar *title); void fu_progressbar_set_interactive (FuProgressbar *self, gboolean interactive); - -G_END_DECLS diff --git a/src/fu-quirks.h b/src/fu-quirks.h index ab0b5dcc1..8aca6373e 100644 --- a/src/fu-quirks.h +++ b/src/fu-quirks.h @@ -9,8 +9,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_QUIRKS (fu_quirks_get_type ()) G_DECLARE_FINAL_TYPE (FuQuirks, fu_quirks, FU, QUIRKS, GObject) @@ -48,5 +46,3 @@ gboolean fu_quirks_get_kvs_for_guid (FuQuirks *self, #define FU_QUIRKS_INSTALL_DURATION "InstallDuration" #define FU_QUIRKS_VERSION_FORMAT "VersionFormat" #define FU_QUIRKS_GTYPE "GType" - -G_END_DECLS diff --git a/src/fu-smbios.h b/src/fu-smbios.h index b6696e2dd..d3b734f66 100644 --- a/src/fu-smbios.h +++ b/src/fu-smbios.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - #define FU_TYPE_SMBIOS (fu_smbios_get_type ()) G_DECLARE_FINAL_TYPE (FuSmbios, fu_smbios, FU, SMBIOS, GObject) @@ -38,5 +36,3 @@ const gchar *fu_smbios_get_string (FuSmbios *self, GBytes *fu_smbios_get_data (FuSmbios *self, guint8 type, GError **error); - -G_END_DECLS diff --git a/src/fu-srec-firmware.h b/src/fu-srec-firmware.h index d4263769c..22605b0e9 100644 --- a/src/fu-srec-firmware.h +++ b/src/fu-srec-firmware.h @@ -8,8 +8,6 @@ #include "fu-firmware.h" -G_BEGIN_DECLS - #define FU_TYPE_SREC_FIRMWARE (fu_srec_firmware_get_type ()) G_DECLARE_FINAL_TYPE (FuSrecFirmware, fu_srec_firmware, FU, SREC_FIRMWARE, FuFirmware) @@ -39,5 +37,3 @@ GPtrArray *fu_srec_firmware_get_records (FuSrecFirmware *self); FuSrecFirmwareRecord *fu_srec_firmware_record_new (guint ln, FuFirmareSrecRecordKind kind, guint32 addr); - -G_END_DECLS diff --git a/src/fu-systemd.h b/src/fu-systemd.h index 72b899ec1..d1781fe56 100644 --- a/src/fu-systemd.h +++ b/src/fu-systemd.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - gboolean fu_systemd_unit_check_exists (const gchar *unit, GError **error); gboolean fu_systemd_unit_stop (const gchar *unit, @@ -19,5 +17,3 @@ gboolean fu_systemd_unit_enable (const gchar *unit, gboolean fu_systemd_unit_disable (const gchar *unit, GError **error); gchar *fu_systemd_get_default_target (GError **error); - -G_END_DECLS diff --git a/src/fu-test.h b/src/fu-test.h index 585822a93..d12fce7fa 100644 --- a/src/fu-test.h +++ b/src/fu-test.h @@ -8,8 +8,6 @@ #include -G_BEGIN_DECLS - gchar *fu_test_get_filename (const gchar *testdatadirs, const gchar *filename); void fu_test_loop_run_with_timeout (guint timeout_ms); @@ -17,5 +15,3 @@ void fu_test_loop_quit (void); gboolean fu_test_compare_lines (const gchar *txt1, const gchar *txt2, GError **error); - -G_END_DECLS diff --git a/src/fu-udev-device-private.h b/src/fu-udev-device-private.h index b06a52bb7..857e5538c 100644 --- a/src/fu-udev-device-private.h +++ b/src/fu-udev-device-private.h @@ -8,8 +8,4 @@ #include "fu-udev-device.h" -G_BEGIN_DECLS - void fu_udev_device_emit_changed (FuUdevDevice *self); - -G_END_DECLS diff --git a/src/fu-udev-device.h b/src/fu-udev-device.h index 621443af9..e19d20674 100644 --- a/src/fu-udev-device.h +++ b/src/fu-udev-device.h @@ -11,8 +11,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_UDEV_DEVICE (fu_udev_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuUdevDevice, fu_udev_device, FU, UDEV_DEVICE, FuDevice) @@ -38,5 +36,3 @@ gboolean fu_udev_device_set_physical_id (FuUdevDevice *self, const gchar *subsystem, GError **error); void fu_udev_device_dump (FuUdevDevice *self); - -G_END_DECLS diff --git a/src/fu-usb-device-private.h b/src/fu-usb-device-private.h index 9886ff618..5b650d748 100644 --- a/src/fu-usb-device-private.h +++ b/src/fu-usb-device-private.h @@ -8,8 +8,4 @@ #include "fu-usb-device.h" -G_BEGIN_DECLS - const gchar *fu_usb_device_get_platform_id (FuUsbDevice *self); - -G_END_DECLS diff --git a/src/fu-usb-device.h b/src/fu-usb-device.h index d4a9d9715..10b13ae78 100644 --- a/src/fu-usb-device.h +++ b/src/fu-usb-device.h @@ -12,8 +12,6 @@ #include "fu-plugin.h" -G_BEGIN_DECLS - #define FU_TYPE_USB_DEVICE (fu_usb_device_get_type ()) G_DECLARE_DERIVABLE_TYPE (FuUsbDevice, fu_usb_device, FU, USB_DEVICE, FuDevice) @@ -48,5 +46,3 @@ void fu_usb_device_set_dev (FuUsbDevice *device, gboolean fu_usb_device_is_open (FuUsbDevice *device); GUdevDevice *fu_usb_device_find_udev_device (FuUsbDevice *device, GError **error); - -G_END_DECLS diff --git a/src/fu-util-common.h b/src/fu-util-common.h index 6b3beaeea..dd3e344b1 100644 --- a/src/fu-util-common.h +++ b/src/fu-util-common.h @@ -10,8 +10,6 @@ #include #include -G_BEGIN_DECLS - /* this is only valid for tools */ #define FWUPD_ERROR_INVALID_ARGS (FWUPD_ERROR_LAST+1) @@ -75,5 +73,3 @@ gchar *fu_util_release_to_string (FwupdRelease *rel, guint idt); gchar *fu_util_remote_to_string (FwupdRemote *remote, guint idt); - -G_END_DECLS