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

2008-08-14 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-netlink-monitor.c
	  src/nm-netlink-monitor.h
	  src/nm-device-ethernet.c
		- (nm_netlink_monitor_request_status): return an error on failure
		- (constructor): don't segfault on missing error



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3958 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-08-14 15:47:26 +00:00
parent 0252ad9df3
commit cb79727fa2
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-08-14 Dan Williams <dcbw@redhat.com>
* src/nm-netlink-monitor.c
src/nm-netlink-monitor.h
src/nm-device-ethernet.c
- (nm_netlink_monitor_request_status): return an error on failure
- (constructor): don't segfault on missing error
2008-08-13 Dan Williams <dcbw@redhat.com>
* callouts/nm-dispatcher-action.c

2
src/nm-device-ethernet.c
View File

@@ -291,7 +291,7 @@ constructor (GType type,
dev);
if (!nm_netlink_monitor_request_status (monitor, &error)) {
nm_warning ("couldn't request carrier state: %s", error->message);
nm_warning ("couldn't request carrier state: %s", error ? error->message : "unknown");
g_error_free (error);
}

5
src/nm-netlink-monitor.c
View File

@@ -434,7 +434,10 @@ nm_netlink_monitor_request_status (NMNetlinkMonitor *monitor,
/* Update the link cache with latest state */
if (nl_cache_refill (priv->nlh, priv->nlh_link_cache)) {
nm_warning ("Error updating link cache: %s", nl_geterror ());
g_set_error (error, NM_NETLINK_MONITOR_ERROR,
NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE,
_("error updating link cache: %s"),
nl_geterror ());
return FALSE;
}

1
src/nm-netlink-monitor.h
View File

@@ -43,6 +43,7 @@ typedef enum {
NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE,
NM_NETLINK_MONITOR_ERROR_BAD_ALLOC,
NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA,
NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE
} NMNetlinkMonitorError;
typedef struct {