Break API some more

Since we've broken the API anyway, remove some aliases which only
exist for backwards compatibility.

diff --git a/include/netlink/cache.h b/include/netlink/cache.h
index b437d76f169f50586e904f44b02b170ffc1c9b90..604a56f86640cd6d7448b77ba3c3630bbd6401fd 100644 (file)
--- a/include/netlink/cache.h
+++ b/include/netlink/cache.h
@@ -36,8 +36,6 @@ extern struct nl_object *     nl_cache_get_last(struct nl_cache *);
 extern struct nl_object *      nl_cache_get_next(struct nl_object *);
 extern struct nl_object *      nl_cache_get_prev(struct nl_object *);
 
-/* Cache creation/deletion */
-#define nl_cache_alloc_from_ops(ptr)   nl_cache_alloc(ptr)
 extern struct nl_cache *       nl_cache_alloc(struct nl_cache_ops *);
 extern int                     nl_cache_alloc_and_fill(struct nl_cache_ops *,
                                                        struct nl_handle *,
@@ -54,9 +52,7 @@ extern int                    nl_cache_add(struct nl_cache *,
                                             struct nl_object *);
 extern int                     nl_cache_parse_and_add(struct nl_cache *,
                                                       struct nl_msg *);
-#define nl_cache_delete(a, b)  nl_cache_remove(b)
 extern void                    nl_cache_remove(struct nl_object *);
-#define nl_cache_update(a, b)  nl_cache_refill(a, b)
 extern int                     nl_cache_refill(struct nl_handle *,
                                                struct nl_cache *);
 extern int                     nl_cache_pickup(struct nl_handle *,

diff --git a/include/netlink/msg.h b/include/netlink/msg.h
index 732e66f3516dd943daccd98f75a5fcb11009e1f8..1cb130536151cdb8d37e8383fb01ca422e6d9295 100644 (file)
--- a/include/netlink/msg.h
+++ b/include/netlink/msg.h
@@ -68,11 +68,6 @@ extern struct nlattr *         nlmsg_find_attr(struct nlmsghdr *, int, int);
 extern int               nlmsg_validate(struct nlmsghdr *, int, int,
                                         struct nla_policy *);
 
-/* Backward compatibility */
-#define nlmsg_new()                    nlmsg_alloc()
-#define nlmsg_build_simple(a, b)       nlmsg_alloc_simple(a, b)
-#define nlmsg_build(ptr)               nlmsg_inherit(ptr)
-
 extern struct nl_msg *   nlmsg_alloc(void);
 extern struct nl_msg *   nlmsg_alloc_size(size_t);
 extern struct nl_msg *   nlmsg_alloc_simple(int, int);

diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h
index eff4b16c06106a0eb177057445ffaf26120428e8..4dafbc8e51b85122f41cc6336e1b644e0e402ae3 100644 (file)
--- a/include/netlink/netlink.h
+++ b/include/netlink/netlink.h
@@ -59,7 +59,6 @@ extern int                    nl_recv(struct nl_handle *,
 
 extern int                     nl_recvmsgs(struct nl_handle *, struct nl_cb *);
 
-#define nl_recvmsgs_def(handle) nl_recvmsgs_default(handle)
 extern int                     nl_recvmsgs_default(struct nl_handle *);
 
 extern int                     nl_wait_for_ack(struct nl_handle *);

diff --git a/include/netlink/route/rule.h b/include/netlink/route/rule.h
index 15551850a504ed87db460cf59397c91716a9be2e..2602f77f538f5096598c6fecd7da4f92fd230b0f 100644 (file)
--- a/include/netlink/route/rule.h
+++ b/include/netlink/route/rule.h
@@ -44,9 +44,7 @@ extern void           rtnl_rule_set_family(struct rtnl_rule *, int);
 extern int             rtnl_rule_get_family(struct rtnl_rule *);
 extern void            rtnl_rule_set_prio(struct rtnl_rule *, int);
 extern int             rtnl_rule_get_prio(struct rtnl_rule *);
-#define rtnl_rule_set_fwmark(ptr, n) rtnl_rule_set_mark(ptr, n)
 extern void            rtnl_rule_set_mark(struct rtnl_rule *, uint64_t);
-#define rtnl_rule_get_fwmark(ptr) rtnl_rule_get_mark(ptr)
 extern uint64_t                rtnl_rule_get_mark(struct rtnl_rule *);
 extern void            rtnl_rule_set_table(struct rtnl_rule *, int);
 extern int             rtnl_rule_get_table(struct rtnl_rule *);