Attachment 846408 Details for Bug 1049107 – Patch to fix NetworkManager compile

[patch] Patch to fix NetworkManager compile

nm-compile.patch (text/plain), 1.23 KB, created by Scott Shambarger on 2014-01-07 03:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Shambarger

Created: 2014-01-07 03:16:16 UTC

Size: 1.23 KB

patch

obsolete

>--- a/libnm-glib/nm-remote-settings.c
>+++ b/libnm-glib/nm-remote-settings.c
>@@ -664,8 +664,8 @@
> 	char **my_failures = NULL;
> 	gboolean ret = FALSE;
> 
>-	g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), NULL);
>-	g_return_val_if_fail (filenames != NULL, NULL);
>+	g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE);
>+	g_return_val_if_fail (filenames != NULL, FALSE);
> 
> 	priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);
> 
>--- a/src/settings/nm-system-config-interface.c
>+++ b/src/settings/nm-system-config-interface.c
>@@ -141,7 +141,7 @@
> nm_system_config_interface_load_connection (NMSystemConfigInterface *config,
>                                             const char *filename)
> {
>-	g_return_val_if_fail (config != NULL, NULL);
>+	g_return_val_if_fail (config != NULL, FALSE);
> 
> 	if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->load_connection)
> 		return NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->load_connection (config, filename);
>--- a/src/devices/nm-device.c
>+++ b/src/devices/nm-device.c
>@@ -6866,7 +6866,7 @@
> 			             nm_device_get_iface (device),
> 			             g_slist_length (priv->pending_actions),
> 			             action);
>-			g_return_val_if_reached (FALSE);
>+			g_return_if_reached ();
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 1049107: 846408