From c2dc5d3b0f11dd9d9076bbc7e8500860ea00e339 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 8 Dec 2014 19:49:46 +0100 Subject: [PATCH] settings: fix wrong assertions for calling nm_settings_connection_replace_settings() --- src/settings/plugins/ifcfg-rh/plugin.c | 3 ++- src/settings/plugins/ifnet/plugin.c | 3 ++- src/settings/plugins/keyfile/plugin.c | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 3594399fb7..458e62898d 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -342,8 +342,9 @@ connection_new_or_changed (SCPluginIfcfg *self, FALSE, /* don't set Unsaved */ &error)) { /* Shouldn't ever get here as 'new' was verified by the reader already */ - g_assert_no_error (error); + g_assert_not_reached (); } + g_assert_no_error (error); } g_object_unref (new); diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c index 6896a4da1a..37e2907777 100644 --- a/src/settings/plugins/ifnet/plugin.c +++ b/src/settings/plugins/ifnet/plugin.c @@ -315,8 +315,9 @@ reload_connections (NMSystemConfigInterface *config) FALSE, /* don't set Unsaved */ &error)) { /* Shouldn't ever get here as 'new' was verified by the reader already */ - g_assert_no_error (error); + g_assert_not_reached (); } + g_assert_no_error (error); nm_log_info (LOGD_SETTINGS, "Connection %s updated", nm_connection_get_id (NM_CONNECTION (new))); } diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index ead074362e..f7c9211c7e 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -128,8 +128,9 @@ update_connection (SCPluginKeyfile *self, FALSE, /* don't set Unsaved */ &error)) { /* Shouldn't ever get here as 'new' was verified by the reader already */ - g_assert_no_error (error); + g_assert_not_reached (); } + g_assert_no_error (error); } g_object_unref (tmp); } @@ -183,8 +184,9 @@ new_connection (SCPluginKeyfile *self, FALSE, /* don't set Unsaved */ &error)) { /* Shouldn't ever get here as 'tmp' was verified by the reader already */ - g_assert_no_error (error); + g_assert_not_reached (); } + g_assert_no_error (error); g_object_unref (tmp); if (out_old_path) *out_old_path = g_strdup (nm_settings_connection_get_filename (connection));