Replace RTNL_LINK_NOT_FOUND with just 0

The interface index 0 is reserved and can be safely used to
signal that the device does not exist.

diff --git a/include/netlink/route/link.h b/include/netlink/route/link.h
index 87e5adaff006728010d5c24c0b55a79b1797a4da..ec151aa7671ded61de7a636c0b64dfb3e10b42d8 100644 (file)
--- a/include/netlink/route/link.h
+++ b/include/netlink/route/link.h
@@ -51,12 +51,6 @@ enum rtnl_link_st {
 
 #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
 
-/**
- * Special interface index stating the link was not found.
- * @ingroup link
- */
-#define RTNL_LINK_NOT_FOUND -1
-
 /* link object allocation/freeage */
 extern struct rtnl_link *rtnl_link_alloc(void);
 extern void    rtnl_link_put(struct rtnl_link *);

diff --git a/lib/route/addr.c b/lib/route/addr.c
index e9101a0409448501e6cfb5c5cfe00fe86a175fa4..905dce2119319d759ca08766029ea6582fdeb82f 100644 (file)
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -872,10 +872,7 @@ void rtnl_addr_set_ifindex(struct rtnl_addr *addr, int ifindex)
 
 int rtnl_addr_get_ifindex(struct rtnl_addr *addr)
 {
-       if (addr->ce_mask & ADDR_ATTR_IFINDEX)
-               return addr->a_ifindex;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return addr->a_ifindex;
 }
 
 void rtnl_addr_set_family(struct rtnl_addr *addr, int family)
@@ -886,10 +883,7 @@ void rtnl_addr_set_family(struct rtnl_addr *addr, int family)
 
 int rtnl_addr_get_family(struct rtnl_addr *addr)
 {
-       if (addr->ce_mask & ADDR_ATTR_FAMILY)
-               return addr->a_family;
-       else
-               return AF_UNSPEC;
+       return addr->a_family;
 }
 
 void rtnl_addr_set_prefixlen(struct rtnl_addr *addr, int prefix)

diff --git a/lib/route/link.c b/lib/route/link.c
index 182aba8976ebe73b0b7bd6a91d89b95d3640f123..510932fbd919b3d08d641a6628b89f95cc423f60 100644 (file)
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -1092,11 +1092,11 @@ char * rtnl_link_i2name(struct nl_cache *cache, int ifindex, char *dst,
  * @arg cache          link cache
  * @arg name           link name
  *
- * @return interface index or RTNL_LINK_NOT_FOUND if no match was found.
+ * @return interface index or 0 if no match was found.
  */
 int rtnl_link_name2i(struct nl_cache *cache, const char *name)
 {
-       int ifindex = RTNL_LINK_NOT_FOUND;
+       int ifindex = 0;
        struct rtnl_link *link;
        
        link = rtnl_link_get_by_name(cache, name);
@@ -1366,10 +1366,7 @@ void rtnl_link_set_ifindex(struct rtnl_link *link, int ifindex)
 
 int rtnl_link_get_ifindex(struct rtnl_link *link)
 {
-       if (link->ce_mask & LINK_ATTR_IFINDEX)
-               return link->l_index;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return link->l_index;
 }
 
 void rtnl_link_set_mtu(struct rtnl_link *link, unsigned int mtu)
@@ -1422,10 +1419,7 @@ void rtnl_link_set_link(struct rtnl_link *link, int ifindex)
 
 int rtnl_link_get_link(struct rtnl_link *link)
 {
-       if (link->ce_mask & LINK_ATTR_LINK)
-               return link->l_link;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return link->l_link;
 }
 
 void rtnl_link_set_master(struct rtnl_link *link, int ifindex)
@@ -1436,10 +1430,7 @@ void rtnl_link_set_master(struct rtnl_link *link, int ifindex)
 
 int rtnl_link_get_master(struct rtnl_link *link)
 {
-       if (link->ce_mask & LINK_ATTR_MASTER)
-               return link->l_master;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return link->l_master;
 }
 
 void rtnl_link_set_operstate(struct rtnl_link *link, uint8_t operstate)

diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index 723df7bcd9da57db06ac4b247e60be48717e5e35..3c8fb1c6b8a7fc5b5e31cfd8e80424c3a82b1fee 100644 (file)
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -883,10 +883,7 @@ void rtnl_neigh_set_ifindex(struct rtnl_neigh *neigh, int ifindex)
 
 int rtnl_neigh_get_ifindex(struct rtnl_neigh *neigh)
 {
-       if (neigh->ce_mask & NEIGH_ATTR_IFINDEX)
-               return neigh->n_ifindex;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return neigh->n_ifindex;
 }
 
 static inline int __assign_addr(struct rtnl_neigh *neigh, struct nl_addr **pos,

diff --git a/lib/route/tc.c b/lib/route/tc.c
index de909be7cf27bbbf360b74e8373ab99c9275fd84..15e88d4303d2269fc91615a935a7b2cb4560dff9 100644 (file)
--- a/lib/route/tc.c
+++ b/lib/route/tc.c
@@ -274,10 +274,7 @@ void tca_set_ifindex(struct rtnl_tca *t, int ifindex)
 
 int tca_get_ifindex(struct rtnl_tca *t)
 {
-       if (t->ce_mask & TCA_ATTR_IFINDEX)
-               return t->tc_ifindex;
-       else
-               return RTNL_LINK_NOT_FOUND;
+       return t->tc_ifindex;
 }
 
 void tca_set_handle(struct rtnl_tca *t, uint32_t handle)