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

Remove some duplicated unsafe API

Browse Source
This commit is contained in:
Richard Hughes 2022-06-01 22:13:58 +01:00 committed by Mario Limonciello
parent d6fd08e3a5
commit 4ee6cce9b8
13 changed files with 114 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfwupdplugin/README.md
View File

@ -50,3 +50,5 @@ Remember: Plugins should be upstream!
* `fu_udev_device_ioctl_full()`: Use `fu_udev_device_ioctl()` instead -- as the latter now always specifies the timeout.
* `fu_udev_device_new_full()`: Use `fu_udev_device_new()` instead -- as the latter always specifies the context.
* `fu_usb_device_new_full()`: Use `fu_usb_device_new()` instead -- as the latter always specifies the context.
* `fu_device_new_with_context()`: Use `fu_device_new()` instead -- as the latter always specifies the context.
* `fu_plugin_has_custom_flag()`: Use `fu_plugin_has_private_flag()` instead.

17
libfwupdplugin/fu-device.c
View File

@ -5456,23 +5456,10 @@ fu_device_finalize(GObject *object)
*
* Creates a new #Fudevice
*
* Since: 0.1.0
* Since: 1.8.2
**/
FuDevice *
fu_device_new(void)
{
return fu_device_new_with_context(NULL);
}
/**
* fu_device_new_with_context:
*
* Creates a new #Fudevice
*
* Since: 1.6.2
**/
FuDevice *
fu_device_new_with_context(FuContext *ctx)
fu_device_new(FuContext *ctx)
{
FuDevice *self = g_object_new(FU_TYPE_DEVICE, "context", ctx, NULL);
return FU_DEVICE(self);

4
libfwupdplugin/fu-device.h
View File

@ -137,9 +137,7 @@ typedef gboolean (*FuDeviceRetryFunc)(FuDevice *self,
GError **error) G_GNUC_WARN_UNUSED_RESULT;
FuDevice *
fu_device_new(void);
FuDevice *
fu_device_new_with_context(FuContext *ctx);
fu_device_new(FuContext *ctx);
/* helpful casting macros */
#define fu_device_has_flag(d, v) fwupd_device_has_flag(FWUPD_DEVICE(d), v)

72
libfwupdplugin/fu-self-test.c
View File

@ -225,7 +225,7 @@ fu_common_version_guess_format_func(void)
static void
fu_device_version_format_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
fu_device_add_internal_flag(device, FU_DEVICE_INTERNAL_FLAG_ENSURE_SEMVER);
fu_device_set_version_format(device, FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_version(device, "Ver1.2.3 RELEASE");
@ -236,7 +236,7 @@ static void
fu_device_open_refcount_func(void)
{
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(GError) error = NULL;
fu_device_set_id(device, "test_device");
ret = fu_device_open(device, &error);
@ -259,8 +259,8 @@ fu_device_open_refcount_func(void)
static void
fu_device_name_func(void)
{
g_autoptr(FuDevice) device1 = fu_device_new();
g_autoptr(FuDevice) device2 = fu_device_new();
g_autoptr(FuDevice) device1 = fu_device_new(NULL);
g_autoptr(FuDevice) device2 = fu_device_new(NULL);
/* vendor then name */
fu_device_set_vendor(device1, " Hughski ");
@ -318,7 +318,7 @@ fu_device_cfi_device_func(void)
static void
fu_device_metadata_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
/* string */
fu_device_set_metadata(device, "foo", "bar");
@ -688,8 +688,8 @@ _plugin_device_added_cb(FuPlugin *plugin, FuDevice *device, gpointer user_data)
static void
fu_plugin_devices_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuPlugin) plugin = fu_plugin_new(NULL);
GPtrArray *devices;
@ -718,9 +718,9 @@ fu_plugin_devices_func(void)
static void
fu_plugin_device_inhibit_children_func(void)
{
g_autoptr(FuDevice) parent = fu_device_new();
g_autoptr(FuDevice) child1 = fu_device_new();
g_autoptr(FuDevice) child2 = fu_device_new();
g_autoptr(FuDevice) parent = fu_device_new(NULL);
g_autoptr(FuDevice) child1 = fu_device_new(NULL);
g_autoptr(FuDevice) child2 = fu_device_new(NULL);
fu_device_set_id(parent, "testdev");
fu_device_set_name(parent, "testdev");
@ -770,7 +770,7 @@ fu_plugin_delay_func(void)
&device_tmp);
/* add device straight away */
device = fu_device_new();
device = fu_device_new(NULL);
fu_device_set_id(device, "testdev");
fu_plugin_device_add(plugin, device);
g_assert_nonnull(device_tmp);
@ -860,7 +860,7 @@ fu_plugin_quirks_device_func(void)
FuDevice *device_tmp;
GPtrArray *children;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(FuContext) ctx = fu_context_new();
g_autoptr(GError) error = NULL;
@ -1008,7 +1008,7 @@ fu_device_locker_fail_func(void)
{
g_autoptr(FuDeviceLocker) locker = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
locker = fu_device_locker_new_full(device,
(FuDeviceLockerFunc)_fail_open_cb,
(FuDeviceLockerFunc)_fail_close_cb,
@ -1680,7 +1680,7 @@ fu_device_poll_cb(FuDevice *device, GError **error)
static void
fu_device_poll_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
FuDeviceClass *klass = FU_DEVICE_GET_CLASS(device);
guint cnt;
@ -1703,7 +1703,7 @@ fu_device_poll_func(void)
static void
fu_device_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(GPtrArray) possible_plugins = NULL;
/* only add one plugin name of the same type */
@ -1718,7 +1718,7 @@ fu_device_instance_ids_func(void)
{
gboolean ret;
g_autoptr(FuContext) ctx = fu_context_new();
g_autoptr(FuDevice) device = fu_device_new_with_context(ctx);
g_autoptr(FuDevice) device = fu_device_new(ctx);
g_autoptr(GError) error = NULL;
/* do not save silo */
@ -1746,10 +1746,10 @@ fu_device_instance_ids_func(void)
static void
fu_device_composite_id_func(void)
{
g_autoptr(FuDevice) dev1 = fu_device_new();
g_autoptr(FuDevice) dev2 = fu_device_new();
g_autoptr(FuDevice) dev3 = fu_device_new();
g_autoptr(FuDevice) dev4 = fu_device_new();
g_autoptr(FuDevice) dev1 = fu_device_new(NULL);
g_autoptr(FuDevice) dev2 = fu_device_new(NULL);
g_autoptr(FuDevice) dev3 = fu_device_new(NULL);
g_autoptr(FuDevice) dev4 = fu_device_new(NULL);
/* single device */
fu_device_set_id(dev1, "dev1");
@ -1798,7 +1798,7 @@ fu_device_composite_id_func(void)
static void
fu_device_inhibit_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
fu_device_add_flag(device, FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_battery_threshold(device, 25);
@ -1835,7 +1835,7 @@ fu_device_inhibit_func(void)
static void
fu_device_inhibit_updateable_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_assert_false(fu_device_has_flag(device, FWUPD_DEVICE_FLAG_UPDATABLE));
g_assert_false(fu_device_has_flag(device, FWUPD_DEVICE_FLAG_UPDATABLE_HIDDEN));
@ -1862,7 +1862,7 @@ static void
fu_device_private_flags_func(void)
{
g_autofree gchar *tmp = NULL;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
fu_device_register_private_flag(device, TEST_FLAG_FOO, "foo");
fu_device_register_private_flag(device, TEST_FLAG_BAR, "bar");
@ -1890,7 +1890,7 @@ fu_device_private_flags_func(void)
static void
fu_device_flags_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
/* bitfield */
for (guint64 i = 1; i < FU_DEVICE_INTERNAL_FLAG_UNKNOWN; i *= 2) {
@ -1930,8 +1930,8 @@ fu_device_children_func(void)
{
gboolean ret;
g_autoptr(FuContext) ctx = fu_context_new();
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) parent = fu_device_new_with_context(ctx);
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuDevice) parent = fu_device_new(ctx);
g_autoptr(GError) error = NULL;
/* do not save silo */
@ -1961,11 +1961,11 @@ fu_device_children_func(void)
static void
fu_device_parent_func(void)
{
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuDevice) child_root = NULL;
g_autoptr(FuDevice) grandparent = fu_device_new();
g_autoptr(FuDevice) grandparent = fu_device_new(NULL);
g_autoptr(FuDevice) grandparent_root = NULL;
g_autoptr(FuDevice) parent = fu_device_new();
g_autoptr(FuDevice) parent = fu_device_new(NULL);
g_autoptr(FuDevice) parent_root = NULL;
fu_device_set_physical_id(child, "dummy");
@ -1993,8 +1993,8 @@ fu_device_parent_func(void)
static void
fu_device_incorporate_func(void)
{
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) donor = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(FuDevice) donor = fu_device_new(NULL);
/* set up donor device */
fu_device_set_alternate_id(donor, "alt-id");
@ -2031,8 +2031,8 @@ fu_backend_func(void)
FuDevice *dev;
gboolean ret;
g_autoptr(FuBackend) backend = g_object_new(FU_TYPE_BACKEND, NULL);
g_autoptr(FuDevice) dev1 = fu_device_new();
g_autoptr(FuDevice) dev2 = fu_device_new();
g_autoptr(FuDevice) dev1 = fu_device_new(NULL);
g_autoptr(FuDevice) dev2 = fu_device_new(NULL);
g_autoptr(GError) error = NULL;
g_autoptr(GPtrArray) devices = NULL;
@ -3274,7 +3274,7 @@ static void
fu_device_retry_success_func(void)
{
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(GError) error = NULL;
FuDeviceRetryHelper helper = {
.cnt_success = 0,
@ -3295,7 +3295,7 @@ static void
fu_device_retry_failed_func(void)
{
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(GError) error = NULL;
FuDeviceRetryHelper helper = {
.cnt_success = 0,
@ -3316,7 +3316,7 @@ static void
fu_device_retry_hardware_func(void)
{
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(NULL);
g_autoptr(GError) error = NULL;
FuDeviceRetryHelper helper = {
.cnt_success = 0,

3
libfwupdplugin/fwupdplugin.map
View File

@ -5,7 +5,6 @@ LIBFWUPDPLUGIN_0.1.0 {
fu_device_add_flag;
fu_device_get_metadata;
fu_device_get_type;
fu_device_new;
fu_device_set_metadata;
local: *;
};
@ -809,7 +808,6 @@ LIBFWUPDPLUGIN_1.6.2 {
fu_device_get_results;
fu_device_has_parent_physical_id;
fu_device_has_private_flag;
fu_device_new_with_context;
fu_device_register_private_flag;
fu_device_remove_child;
fu_device_remove_private_flag;
@ -1046,6 +1044,7 @@ LIBFWUPDPLUGIN_1.8.1 {
LIBFWUPDPLUGIN_1.8.2 {
global:
fu_device_new;
fu_progress_add_step_full;
fu_progress_get_name;
fu_progress_set_name;

2
plugins/amt/fu-plugin-amt.c
View File

@ -455,7 +455,7 @@ fu_plugin_amt_create_device(FuPlugin *plugin, GError **error)
}
memcpy(&ver, response->data, sizeof(struct amt_code_versions));
dev = fu_device_new_with_context(fu_plugin_get_context(plugin));
dev = fu_device_new(fu_plugin_get_context(plugin));
fu_device_set_id(dev, "/dev/mei0");
fu_device_set_vendor(dev, "Intel");
fu_device_add_flag(dev, FWUPD_DEVICE_FLAG_INTERNAL);

2
plugins/dell-esrt/fu-plugin-dell-esrt.c
View File

@ -157,7 +157,7 @@ fu_plugin_dell_esrt_unlock(FuPlugin *plugin, FuDevice *device, GError **error)
static gboolean
fu_plugin_dell_esrt_coldplug(FuPlugin *plugin, GError **error)
{
g_autoptr(FuDevice) dev = fu_device_new();
g_autoptr(FuDevice) dev = fu_device_new(NULL);
/* create a dummy device so we can unlock the feature */
fu_device_set_id(dev, "UEFI-dummy");

6
plugins/dell/fu-plugin-dell.c
View File

@ -254,7 +254,7 @@ fu_plugin_dock_node(FuPlugin *plugin,
return FALSE;
}
dev = fu_device_new_with_context(ctx);
dev = fu_device_new(ctx);
fu_device_set_physical_id(dev, platform);
fu_device_set_logical_id(dev, component_guid);
if (component_desc != NULL) {
@ -757,7 +757,7 @@ fu_plugin_dell_detect_tpm(FuPlugin *plugin, GError **error)
pretty_tpm_name_alt = g_strdup_printf("TPM %s", tpm_mode_alt);
/* build Standard device nodes */
dev = fu_device_new_with_context(ctx);
dev = fu_device_new(ctx);
fu_device_set_physical_id(dev, "DEVNAME=/dev/tpm0");
fu_device_set_logical_id(dev, "UEFI");
fu_device_add_instance_id(dev, tpm_guid_raw);
@ -794,7 +794,7 @@ fu_plugin_dell_detect_tpm(FuPlugin *plugin, GError **error)
/* build alternate device node */
if (can_switch_modes) {
dev_alt = fu_device_new_with_context(ctx);
dev_alt = fu_device_new(ctx);
fu_device_set_id(dev_alt, tpm_id_alt);
fu_device_add_instance_id(dev_alt, tpm_guid_raw_alt);
fu_device_set_vendor(dev, "Dell Inc.");

6
plugins/test/fu-plugin-test.c
View File

@ -78,7 +78,7 @@ fu_plugin_test_coldplug(FuPlugin *plugin, GError **error)
{
FuContext *ctx = fu_plugin_get_context(plugin);
g_autoptr(FuDevice) device = NULL;
device = fu_device_new_with_context(ctx);
device = fu_device_new(ctx);
fu_device_set_id(device, "FakeDevice");
fu_device_add_guid(device, "b585990a-003e-5270-89d5-3705a17f9a43");
fu_device_set_name(device, "Integrated_Webcam(TM)");
@ -111,7 +111,7 @@ fu_plugin_test_coldplug(FuPlugin *plugin, GError **error)
g_autoptr(FuDevice) child1 = NULL;
g_autoptr(FuDevice) child2 = NULL;
child1 = fu_device_new_with_context(ctx);
child1 = fu_device_new(ctx);
fu_device_add_vendor_id(child1, "USB:FFFF");
fu_device_add_protocol(child1, "com.acme");
fu_device_set_physical_id(child1, "fake");
@ -125,7 +125,7 @@ fu_plugin_test_coldplug(FuPlugin *plugin, GError **error)
fu_device_add_flag(child1, FWUPD_DEVICE_FLAG_UNSIGNED_PAYLOAD);
fu_plugin_device_add(plugin, child1);
child2 = fu_device_new_with_context(ctx);
child2 = fu_device_new(ctx);
fu_device_add_vendor_id(child2, "USB:FFFF");
fu_device_add_protocol(child2, "com.acme");
fu_device_set_physical_id(child2, "fake");

2
plugins/uefi-recovery/fu-plugin-uefi-recovery.c
View File

@ -31,7 +31,7 @@ fu_plugin_uefi_recovery_coldplug(FuPlugin *plugin, GError **error)
FuContext *ctx = fu_plugin_get_context(plugin);
GPtrArray *hwids = fu_context_get_hwid_guids(ctx);
const gchar *dmi_vendor;
g_autoptr(FuDevice) device = fu_device_new_with_context(fu_plugin_get_context(plugin));
g_autoptr(FuDevice) device = fu_device_new(fu_plugin_get_context(plugin));
fu_device_set_id(device, "uefi-recovery");
fu_device_set_name(device, "System Firmware ESRT Recovery");
fu_device_set_version_format(device, FWUPD_VERSION_FORMAT_TRIPLET);

2
src/fu-engine.c
View File

@ -4100,7 +4100,7 @@ fu_engine_get_result_from_component(FuEngine *self,
g_autoptr(XbQuery) query = NULL;
#endif
dev = fu_device_new_with_context(self->ctx);
dev = fu_device_new(self->ctx);
provides = xb_node_query(component, "provides/firmware[@type=$'flashed']", 0, &error_local);
if (provides == NULL) {
g_set_error(error,

2
src/fu-history.c
View File

@ -55,7 +55,7 @@ fu_history_device_from_stmt(sqlite3_stmt *stmt)
FwupdRelease *release;
/* create new result */
device = fu_device_new();
device = fu_device_new(NULL);
release = fu_device_get_release_default(device);
/* device_id */

122
src/fu-self-test.c
View File

@ -121,7 +121,7 @@ fu_engine_generate_md_func(gconstpointer user_data)
const gchar *tmp;
gboolean ret;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(GBytes) data = NULL;
g_autoptr(GError) error = NULL;
@ -396,7 +396,7 @@ fu_engine_requirements_version_require_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(GError) error = NULL;
@ -446,7 +446,7 @@ fu_engine_requirements_version_lowest_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(GError) error = NULL;
@ -535,8 +535,8 @@ fu_engine_requirements_child_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -595,8 +595,8 @@ fu_engine_requirements_child_fail_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -698,7 +698,7 @@ fu_engine_requirements_device_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -760,7 +760,7 @@ fu_engine_requirements_device_plain_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -811,7 +811,7 @@ fu_engine_requirements_version_format_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(GError) error = NULL;
@ -862,7 +862,7 @@ fu_engine_requirements_only_upgrade_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(GError) error = NULL;
@ -907,10 +907,10 @@ fu_engine_requirements_sibling_device_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) unrelated_device3 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) parent = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDevice) unrelated_device3 = fu_device_new(self->ctx);
g_autoptr(FuDevice) parent = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release1 = fu_release_new();
@ -1021,8 +1021,8 @@ fu_engine_requirements_other_device_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -1090,8 +1090,8 @@ static void
fu_engine_requirements_protocol_check_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(GPtrArray) devices = NULL;
@ -1179,8 +1179,8 @@ fu_engine_requirements_parent_device_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -1250,9 +1250,9 @@ static void
fu_engine_device_parent_guid_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device3 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device3 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(XbSilo) silo_empty = xb_silo_new();
@ -1304,10 +1304,10 @@ static void
fu_engine_device_parent_id_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device3 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device4 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device3 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device4 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(XbSilo) silo_empty = xb_silo_new();
@ -1375,8 +1375,8 @@ fu_engine_partial_hash_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuPlugin) plugin = fu_plugin_new(NULL);
g_autoptr(GError) error = NULL;
@ -1444,7 +1444,7 @@ fu_engine_device_unlock_func(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(GError) error = NULL;
g_autoptr(GFile) file = NULL;
@ -1488,7 +1488,7 @@ fu_engine_require_hwid_func(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(FuRelease) release = fu_release_new();
@ -1562,7 +1562,7 @@ fu_engine_downgrade_func(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
FwupdRelease *rel;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(GError) error = NULL;
@ -1749,7 +1749,7 @@ fu_engine_install_duration_func(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
FwupdRelease *rel;
gboolean ret;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuEngineRequest) request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);
g_autoptr(GError) error = NULL;
@ -1836,7 +1836,7 @@ fu_engine_history_func(gconstpointer user_data)
g_autofree gchar *device_str = NULL;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device2 = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuHistory) history = NULL;
g_autoptr(FuRelease) release = fu_release_new();
@ -1981,7 +1981,7 @@ fu_engine_multiple_rels_func(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuProgress) progress = fu_progress_new(G_STRLOC);
g_autoptr(GBytes) blob_cab = NULL;
@ -2098,7 +2098,7 @@ fu_engine_history_inherit(gconstpointer user_data)
g_autofree gchar *filename = NULL;
g_autofree gchar *localstatedir = NULL;
g_autofree gchar *history_db = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(FuProgress) progress = fu_progress_new(G_STRLOC);
@ -2211,7 +2211,7 @@ fu_engine_history_inherit(gconstpointer user_data)
engine = fu_engine_new(FU_APP_FLAGS_NONE);
fu_engine_set_silo(engine, silo_empty);
fu_engine_add_plugin(engine, self->plugin);
device = fu_device_new_with_context(self->ctx);
device = fu_device_new(self->ctx);
fu_device_add_internal_flag(device, FU_DEVICE_INTERNAL_FLAG_INHERIT_ACTIVATION);
fu_device_set_id(device, "test_device");
fu_device_add_vendor_id(device, "USB:FFFF");
@ -2229,7 +2229,7 @@ fu_engine_history_inherit(gconstpointer user_data)
engine = fu_engine_new(FU_APP_FLAGS_NONE);
fu_engine_set_silo(engine, silo_empty);
fu_engine_add_plugin(engine, self->plugin);
device = fu_device_new_with_context(self->ctx);
device = fu_device_new(self->ctx);
fu_device_set_id(device, "test_device");
fu_device_add_vendor_id(device, "USB:FFFF");
fu_device_add_protocol(device, "com.acme");
@ -2247,7 +2247,7 @@ fu_engine_install_needs_reboot(gconstpointer user_data)
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuRelease) release = fu_release_new();
g_autoptr(FuProgress) progress = fu_progress_new(G_STRLOC);
@ -2335,7 +2335,7 @@ fu_engine_history_error_func(gconstpointer user_data)
g_autofree gchar *device_str = NULL;
g_autofree gchar *filename = NULL;
g_autoptr(FuDevice) device2 = NULL;
g_autoptr(FuDevice) device = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device = fu_device_new(self->ctx);
g_autoptr(FuEngine) engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_autoptr(FuHistory) history = NULL;
g_autoptr(FuRelease) release = fu_release_new();
@ -2455,8 +2455,8 @@ _device_list_count_cb(FuDeviceList *device_list, FuDevice *device, gpointer user
static void
fu_device_list_no_auto_remove_children_func(gconstpointer user_data)
{
g_autoptr(FuDevice) child = fu_device_new();
g_autoptr(FuDevice) parent = fu_device_new();
g_autoptr(FuDevice) child = fu_device_new(NULL);
g_autoptr(FuDevice) parent = fu_device_new(NULL);
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(GPtrArray) active1 = NULL;
g_autoptr(GPtrArray) active2 = NULL;
@ -2488,8 +2488,8 @@ static void
fu_device_list_delay_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
guint added_cnt = 0;
guint changed_cnt = 0;
@ -2571,9 +2571,9 @@ static void
fu_device_list_replug_auto_func(gconstpointer user_data)
{
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new();
g_autoptr(FuDevice) device2 = fu_device_new();
g_autoptr(FuDevice) parent = fu_device_new();
g_autoptr(FuDevice) device1 = fu_device_new(NULL);
g_autoptr(FuDevice) device2 = fu_device_new(NULL);
g_autoptr(FuDevice) parent = fu_device_new(NULL);
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(GError) error = NULL;
FuDeviceListReplugHelper helper;
@ -2635,8 +2635,8 @@ fu_device_list_replug_user_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
gboolean ret;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(GError) error = NULL;
FuDeviceListReplugHelper helper;
@ -2709,8 +2709,8 @@ static void
fu_device_list_compatible_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device_old = NULL;
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(GPtrArray) devices_all = NULL;
@ -2792,8 +2792,8 @@ fu_device_list_remove_chain_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(FuDevice) device_child = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device_parent = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device_child = fu_device_new(self->ctx);
g_autoptr(FuDevice) device_parent = fu_device_new(self->ctx);
guint added_cnt = 0;
guint changed_cnt = 0;
@ -2843,8 +2843,8 @@ fu_device_list_func(gconstpointer user_data)
{
FuTest *self = (FuTest *)user_data;
g_autoptr(FuDeviceList) device_list = fu_device_list_new();
g_autoptr(FuDevice) device1 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new_with_context(self->ctx);
g_autoptr(FuDevice) device1 = fu_device_new(self->ctx);
g_autoptr(FuDevice) device2 = fu_device_new(self->ctx);
g_autoptr(GPtrArray) devices = NULL;
g_autoptr(GPtrArray) devices2 = NULL;
g_autoptr(GError) error = NULL;
@ -3180,7 +3180,7 @@ fu_plugin_module_func(gconstpointer user_data)
g_assert_cmpstr(fu_device_get_update_error(device3), ==, NULL);
/* get the status */
device_tmp = fu_device_new();
device_tmp = fu_device_new(NULL);
fu_device_set_id(device_tmp, "FakeDevice");
ret = fu_plugin_runner_get_results(self->plugin, device_tmp, &error);
g_assert_no_error(error);
@ -3235,7 +3235,7 @@ fu_history_func(gconstpointer user_data)
(void)g_unlink(filename);
/* add a device */
device = fu_device_new_with_context(self->ctx);
device = fu_device_new(self->ctx);
fu_device_set_id(device, "self-test");
fu_device_set_name(device, "ColorHug"),
fu_device_set_version_format(device, FWUPD_VERSION_FORMAT_TRIPLET);
@ -3799,9 +3799,9 @@ fu_release_compare_func(gconstpointer user_data)
{
FuDevice *device_tmp;
g_autoptr(GPtrArray) releases = g_ptr_array_new();
g_autoptr(FuDevice) device1 = fu_device_new();
g_autoptr(FuDevice) device2 = fu_device_new();
g_autoptr(FuDevice) device3 = fu_device_new();
g_autoptr(FuDevice) device1 = fu_device_new(NULL);
g_autoptr(FuDevice) device2 = fu_device_new(NULL);
g_autoptr(FuDevice) device3 = fu_device_new(NULL);
g_autoptr(FuRelease) release1 = fu_release_new();
g_autoptr(FuRelease) release2 = fu_release_new();
g_autoptr(FuRelease) release3 = fu_release_new();