diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-09-25 17:38:07 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-09-25 17:39:56 +0200 |
| commit | 6d65f1d56ff2ab55a70f11bef9b163c326c8055f (patch) | |
| tree | dcbd3458cfbf0951e44a64e7207f6ef5ae43782d | |
| parent | c772530ec5932fbd54caa2bcd27fa89b9f9fd313 (diff) | |
libnm: fix compilation for wrong g_return call on void/non-void function
Fixes: 41eca3ea490c819c263aa986e1e9bad813dcfe47
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | libnm/nm-remote-connection.c | 2 | ||||
| -rw-r--r-- | libnm/nm-remote-settings.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 0b56e19501..210c62cffc 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -323,7 +323,7 @@ nm_remote_connection_delete (NMRemoteConnection *connection, { NMRemoteConnectionPrivate *priv; - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); + g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection); diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 5d6bbf9c27..5ed6d03949 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -508,8 +508,8 @@ nm_remote_settings_add_connection_async (NMRemoteSettings *settings, GVariant *new_settings; GError *error = NULL; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); + g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings)); + g_return_if_fail (NM_IS_CONNECTION (connection)); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); @@ -663,8 +663,8 @@ nm_remote_settings_load_connections_async (NMRemoteSettings *settings, GSimpleAsyncResult *simple; GError *error = NULL; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); - g_return_val_if_fail (filenames != NULL, FALSE); + g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings)); + g_return_if_fail (filenames != NULL); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); @@ -790,7 +790,7 @@ nm_remote_settings_reload_connections_async (NMRemoteSettings *settings, GSimpleAsyncResult *simple; GError *error = NULL; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); + g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings)); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); @@ -906,7 +906,7 @@ nm_remote_settings_save_hostname_async (NMRemoteSettings *settings, GSimpleAsyncResult *simple; GError *error = NULL; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); + g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings)); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); |