diff options
| author | Dan Williams <dcbw@redhat.com> | 2005-09-06 19:35:50 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2005-09-06 19:35:50 +0000 |
| commit | b1020666caf43fed09277388f6fabb878812bb96 (patch) | |
| tree | 19f9ebabd11595d721a8bf6b0ee2a8a85b43ef83 | |
| parent | a9a40c37233a14684d3722ef6c21d440885ac37b (diff) | |
2005-09-06 Dan Williams <dcbw@redhat.com>
Patch from Tomislav Vujec <tvujec@redhat.com>
* src/NetworkManagerDevice.c
- (nm_get_device_by_udi): don't return a device when we
actually didn't find what we were looking for
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/STABLE_0_3@941 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/NetworkManagerDevice.c | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2005-09-06 Dan Williams <dcbw@redhat.com> + Patch from Tomislav Vujec <tvujec@redhat.com> + * src/NetworkManagerDevice.c + - (nm_get_device_by_udi): don't return a device when we + actually didn't find what we were looking for + +2005-09-06 Dan Williams <dcbw@redhat.com> + Patch from Suhail Ahmed <suhail.ahmed@intel.com> * src/backends/NetworkManagerNeoShine.c src/backends/NetworkManagerRedFlag.c diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index a2f202f061..ab65dcab47 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -149,15 +149,14 @@ NMDevice *nm_get_device_by_udi (NMData *data, const char *udi) for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { - dev = (NMDevice *)(elt->data); - if (dev) + if ((dev = (NMDevice *)(elt->data))) { if (nm_null_safe_strcmp (nm_device_get_udi (dev), udi) == 0) - break; + return dev; } } - return (dev); + return NULL; } |