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

trivial: libfwupd: fix an unused variable in Win32

Browse Source
This commit is contained in:
Mario Limonciello 2022-05-09 09:31:25 -05:00
parent 9633e555e2
commit 53e3ae340b
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libfwupd/fwupd-common.c
View File

@ -140,6 +140,33 @@ fwupd_checksum_get_best(GPtrArray *checksums)
return NULL; return NULL;
} }
static gchar *
fwupd_get_os_release_filename(void)
{
#ifndef _WIN32
const gchar *sysconfdir = g_getenv("FWUPD_SYSCONFDIR");
g_autofree gchar *fn1 = NULL;
/* override */
if (sysconfdir != NULL) {
g_autofree gchar *fn2 = g_build_filename(sysconfdir, "os-release", NULL);
if (g_file_test(fn2, G_FILE_TEST_EXISTS))
return g_steal_pointer(&fn2);
}
/* host locations */
if (g_strcmp0(sysconfdir, "/etc") != 0) {
g_autofree gchar *fn2 = g_strdup("/etc/os-release");
if (g_file_test(fn2, G_FILE_TEST_EXISTS))
return g_steal_pointer(&fn2);
}
fn1 = g_strdup("/usr/lib/os-release");
if (g_file_test(fn1, G_FILE_TEST_EXISTS))
return g_steal_pointer(&fn1);
#endif
return NULL;
}
/** /**
* fwupd_get_os_release: * fwupd_get_os_release:
* @error: (nullable): optional return location for an error * @error: (nullable): optional return location for an error
@ -153,32 +180,15 @@ fwupd_checksum_get_best(GPtrArray *checksums)
GHashTable * GHashTable *
fwupd_get_os_release(GError **error) fwupd_get_os_release(GError **error)
{ {
const gchar *filename = NULL;
const gchar *sysconfdir = g_getenv("FWUPD_SYSCONFDIR");
g_autofree gchar *buf = NULL; g_autofree gchar *buf = NULL;
g_autofree gchar *filename = NULL;
g_auto(GStrv) lines = NULL; g_auto(GStrv) lines = NULL;
g_autoptr(GHashTable) hash = NULL; g_autoptr(GHashTable) hash = NULL;
g_autoptr(GPtrArray) paths = g_ptr_array_new_with_free_func(g_free);
g_return_val_if_fail(error == NULL || *error == NULL, NULL); g_return_val_if_fail(error == NULL || *error == NULL, NULL);
#ifndef _WIN32
/* find the correct file */
if (sysconfdir != NULL)
g_ptr_array_add(paths, g_build_filename(sysconfdir, "os-release", NULL));
if (g_strcmp0(sysconfdir, "/etc") != 0)
g_ptr_array_add(paths, g_strdup("/etc/os-release"));
g_ptr_array_add(paths, g_strdup("/usr/lib/os-release"));
for (guint i = 0; i < paths->len; i++) {
const gchar *path = g_ptr_array_index(paths, i);
if (g_file_test(path, G_FILE_TEST_EXISTS)) {
filename = path;
break;
}
}
#endif
hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
filename = fwupd_get_os_release_filename();
if (filename == NULL) { if (filename == NULL) {
#if defined(_WIN32) #if defined(_WIN32)
/* TODO: Read the Windows version */ /* TODO: Read the Windows version */