colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: fix compilation for wrong g_return call on void/non-void function

Browse Source 
Fixes: 41eca3ea49
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-09-25 17:38:07 +02:00
parent c772530ec5
commit 6d65f1d56f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm/nm-remote-connection.c
View File

@@ -323,7 +323,7 @@ nm_remote_connection_delete (NMRemoteConnection *connection,
{ {
NMRemoteConnectionPrivate *priv; 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); priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection);

12
libnm/nm-remote-settings.c
View File

@@ -508,8 +508,8 @@ nm_remote_settings_add_connection_async (NMRemoteSettings *settings,
GVariant *new_settings; GVariant *new_settings;
GError *error = NULL; GError *error = NULL;
g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings));
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); g_return_if_fail (NM_IS_CONNECTION (connection));
priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);
@@ -663,8 +663,8 @@ nm_remote_settings_load_connections_async (NMRemoteSettings *settings,
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
GError *error = NULL; GError *error = NULL;
g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); g_return_if_fail (NM_IS_REMOTE_SETTINGS (settings));
g_return_val_if_fail (filenames != NULL, FALSE); g_return_if_fail (filenames != NULL);
priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);
@@ -790,7 +790,7 @@ nm_remote_settings_reload_connections_async (NMRemoteSettings *settings,
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
GError *error = NULL; 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); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);
@@ -906,7 +906,7 @@ nm_remote_settings_save_hostname_async (NMRemoteSettings *settings,
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
GError *error = NULL; 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); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);