From fbd30c7dd2b41fbf3b37b6e408119dab9b98185b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 10 Dec 2014 11:24:07 +0100 Subject: [PATCH] keyfile: simplify g_return() checks for _internal_write_connection() --- src/settings/plugins/keyfile/writer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index 311616c57..7f3751faa 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -813,13 +813,10 @@ _internal_write_connection (NMConnection *connection, WriteInfo info; GError *local_err = NULL; - if (out_path) - g_return_val_if_fail (*out_path == NULL, FALSE); + g_return_val_if_fail (!out_path || !*out_path, FALSE); - if (!nm_connection_verify (connection, error)) { + if (!nm_connection_verify (connection, error)) g_return_val_if_reached (FALSE); - return FALSE; - } id = nm_connection_get_id (connection); g_assert (id && *id);