summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-01-14 16:39:42 +0100
committerThomas Haller <thaller@redhat.com>2020-01-14 16:43:26 +0100
commit9f95b797f100fd8862123ba71fc9fc30c26e1d7b (patch)
tree209b68a9894392043c24e34c0476b6ea5b65a8a2
parent39e1e723de016ca6953c9fb3b5762eb93cc13dbe (diff)
downloadNetworkManager-9f95b797f100fd8862123ba71fc9fc30c26e1d7b.tar.gz
initrd/cmdline: minor style cleanups
-rw-r--r--src/initrd/nmi-cmdline-reader.c3
-rw-r--r--src/initrd/tests/test-cmdline-reader.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 619133ca20..2cb93a2d19 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -208,7 +208,7 @@ read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
ibft = nmi_ibft_read (sysfs_dir);
g_hash_table_iter_init (&iter, ibft);
- while (g_hash_table_iter_next (&iter, (gpointer)&mac, (gpointer)&nic)) {
+ while (g_hash_table_iter_next (&iter, (gpointer *) &mac, (gpointer *) &nic)) {
connection = nm_simple_connection_new ();
index = g_hash_table_lookup (nic, "index");
@@ -235,7 +235,6 @@ read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
}
}
-
static void
parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
{
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index dbfe5cc9b7..8951e4913e 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -815,6 +815,7 @@ static void
test_ibft_ip (void)
{
const char *const*ARGV = NM_MAKE_STRV ("ip=ibft");
+
_test_ibft_ip (ARGV);
}
@@ -822,6 +823,7 @@ static void
test_ibft_rd_iscsi_ibft (void)
{
const char *const*ARGV = NM_MAKE_STRV ("rd.iscsi.ibft");
+
_test_ibft_ip (ARGV);
}