From b87ed28f0185cba3e6a4e3fae84dc5011c92c6ef Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 3 Jul 2014 18:54:43 +0200 Subject: [PATCH] libnm-core: don't set GError on invalid @connection argument in _nm_connection_verify() In general, we don't set errors if passing a completely invalid @self pointer to a method. We usually also don't set the error argument when asserting. So, just drop it. Signed-off-by: Thomas Haller --- libnm-core/nm-connection.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 6c6cf9fe36..9feb6ae9bf 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -671,16 +671,8 @@ _nm_connection_verify (NMConnection *connection, GError **error) GError *normalizable_error = NULL; NMSettingVerifyResult normalizable_error_type = NM_SETTING_VERIFY_SUCCESS; - if (error) - g_return_val_if_fail (*error == NULL, NM_SETTING_VERIFY_ERROR); - - if (!NM_IS_CONNECTION (connection)) { - g_set_error_literal (error, - NM_SETTING_CONNECTION_ERROR, - NM_SETTING_CONNECTION_ERROR_UNKNOWN, - "invalid connection; failed verification"); - g_return_val_if_fail (NM_IS_CONNECTION (connection), NM_SETTING_VERIFY_ERROR); - } + g_return_val_if_fail (NM_IS_CONNECTION (connection), NM_SETTING_VERIFY_ERROR); + g_return_val_if_fail (!error || !*error, NM_SETTING_VERIFY_ERROR); priv = NM_CONNECTION_GET_PRIVATE (connection);