diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-03-26 17:32:17 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-04-01 17:18:54 -0500 |
| commit | 7a7ce3b8e248203a6faed5be5641dcc4fdc13c60 (patch) | |
| tree | 01d90245af6df289eba5bd1c096709064962857d /libnm-util/nm-connection.c | |
| parent | df02e7324c68b244f223525108fd351175812cab (diff) | |
| download | NetworkManager-7a7ce3b8e248203a6faed5be5641dcc4fdc13c60.tar.gz | |
libnm-util: convert nm_connection_dump() to GHashTableIter
Diffstat (limited to 'libnm-util/nm-connection.c')
| -rw-r--r-- | libnm-util/nm-connection.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 073d3796ed..1b05ebb9bc 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -1010,16 +1010,6 @@ nm_connection_for_each_setting_value (NMConnection *connection, nm_setting_enumerate_values (NM_SETTING (value), func, user_data); } -static void -dump_setting (gpointer key, gpointer value, gpointer user_data) -{ - char *str; - - str = nm_setting_to_string (NM_SETTING (value)); - g_print ("%s\n", str); - g_free (str); -} - /** * nm_connection_dump: * @connection: the #NMConnection @@ -1031,9 +1021,19 @@ dump_setting (gpointer key, gpointer value, gpointer user_data) void nm_connection_dump (NMConnection *connection) { + GHashTableIter iter; + NMSetting *setting; + const char *setting_name; + char *str; + g_return_if_fail (NM_IS_CONNECTION (connection)); - g_hash_table_foreach (NM_CONNECTION_GET_PRIVATE (connection)->settings, dump_setting, NULL); + g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings); + while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting)) { + str = nm_setting_to_string (setting); + g_print ("%s\n", str); + g_free (str); + } } /** |