proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-06 16:43:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: coreboot: fix a clang compiler error

Browse Source 
```
../plugins/coreboot/fu-plugin-coreboot.c:96:7: error: assigning to 'gchar *' (aka 'char *') from 'const gchar *' (aka 'const char *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]

        name = fu_plugin_coreboot_get_name_for_type (plugin, NULL);

             ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../plugins/coreboot/fu-plugin-coreboot.c:98:8: error: assigning to 'gchar *' (aka 'char *') from 'const gchar *' (aka 'const char *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]

                name = fu_plugin_get_dmi_value (plugin, FU_HWIDS_KEY_PRODUCT_NAME);
```
This commit is contained in:
Mario Limonciello 2019-10-17 22:00:03 -05:00 committed by Richard Hughes
parent fd877a02e0
commit 3d65399626
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/coreboot/fu-coreboot-common.c
View File

@ -12,9 +12,8 @@
#include "fu-plugin-coreboot.h"
/* Tries to convert the coreboot version string to a triplet string.
* Returns NULL on error.
*/
const gchar *
* Returns NULL on error. */
gchar *
fu_plugin_coreboot_version_string_to_triplet (const gchar *coreboot_version,
GError **error)
{
@ -47,7 +46,7 @@ fu_plugin_coreboot_version_string_to_triplet (const gchar *coreboot_version,
}
/* convert firmware type to user friendly string representation */
const gchar*
gchar *
fu_plugin_coreboot_get_name_for_type (FuPlugin *plugin,
const gchar *vboot_partition)
{

12
plugins/coreboot/fu-plugin-coreboot.c
View File

@ -25,14 +25,14 @@ fu_plugin_init (FuPlugin *plugin)
gboolean
fu_plugin_coldplug (FuPlugin *plugin, GError **error)
{
g_autofree const gchar *triplet = NULL;
g_autofree gchar *name = NULL;
const gchar *major;
const gchar *minor;
const gchar *vendor;
const gchar *version;
GBytes *bios_table;
gboolean updatable = FALSE; /* TODO: Implement update support */
g_autofree gchar *name = NULL;
g_autofree gchar *triplet = NULL;
g_autoptr(FuDevice) dev = NULL;
/* don't inlcude FU_HWIDS_KEY_BIOS_VERSION */
@ -94,9 +94,11 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_icon (dev, "computer");
name = fu_plugin_coreboot_get_name_for_type (plugin, NULL);
if (name == NULL)
name = fu_plugin_get_dmi_value (plugin, FU_HWIDS_KEY_PRODUCT_NAME);
fu_device_set_name (dev, name);
if (name != NULL) {
fu_device_set_name (dev, name);
} else {
fu_device_set_name (dev, fu_plugin_get_dmi_value (plugin, FU_HWIDS_KEY_PRODUCT_NAME));
}
fu_device_set_vendor (dev, fu_plugin_get_dmi_value (plugin, FU_HWIDS_KEY_MANUFACTURER));
fu_device_add_instance_id (dev, "main-system-firmware");

7
plugins/coreboot/fu-plugin-coreboot.h
View File

@ -9,8 +9,7 @@
#include "fu-plugin.h"
#include "fu-device.h"
const gchar * fu_plugin_coreboot_version_string_to_triplet (const gchar *coreboot_version,
gchar *fu_plugin_coreboot_version_string_to_triplet (const gchar *coreboot_version,
GError **error);
const gchar* fu_plugin_coreboot_get_name_for_type (FuPlugin *plugin,
const gchar *vboot_partition);
gchar *fu_plugin_coreboot_get_name_for_type (FuPlugin *plugin,
const gchar *vboot_partition);