Detect success from netlink_init_interfaces_list correctly.

2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d8bdf42ca..8171d96f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Chris Lumens  <clumens@redhat.com>
+
+	* isys/nl.c (netlink_interfaces_ip2str, netlink_interfaces_mac2str):
+	Detect success from netlink_init_interfaces_list correctly.
+
 2007-10-17  Peter Jones  <pjones@redhat.com>
 
 	* isys/isys.c: add matchPathContext and setFileContext calls,
diff --git a/isys/nl.c b/isys/nl.c
index 041b2cb79..ee968b510 100644
--- a/isys/nl.c
+++ b/isys/nl.c
@@ -477,9 +477,9 @@ char *netlink_interfaces_ip2str(char *ifname) {
     e = g_slist_find_custom(interfaces,ifname,&_netlink_interfaces_elem_find);
     if (interfaces == NULL || e == NULL) {
         int r = netlink_init_interfaces_list();
-        if (r <= 0) {
-            if (r < 0)
-                perror("netlink_init_interfaces_list in netlink_interface_ip2str");
+
+        if (r < 0) {
+            perror("netlink_init_interfaces_list in netlink_interface_ip2str");
             return NULL;
         }
     }
@@ -528,9 +528,9 @@ char *netlink_interfaces_mac2str(char *ifname) {
     /* init the interfaces list if it's empty */
     if (interfaces == NULL) {
         r = netlink_init_interfaces_list();
-        if (r <= 0) {
-            if (r < 0)
-                perror("netlink_init_interfaces_list in netlink_interface_mac2str");
+
+        if (r < 0) {
+            perror("netlink_init_interfaces_list in netlink_interface_mac2str");
             return NULL;
         }
     }