Remove obsoleted struct nl_handle definition

diff --git a/include/netlink/socket.h b/include/netlink/socket.h
index 4c0589d25a3c34cf1ccc9e1a71e11b2c7d673714..7e71aed793feb3259d4ca6e762e866c96496b2e4 100644 (file)
--- a/include/netlink/socket.h
+++ b/include/netlink/socket.h
@@ -19,9 +19,6 @@
 extern "C" {
 #endif
 
-/* backwards compatibility for now */
-#define nl_handle      nl_sock
-
 extern struct nl_sock *        nl_socket_alloc(void);
 extern struct nl_sock *        nl_socket_alloc_cb(struct nl_cb *);
 extern void            nl_socket_free(struct nl_sock *);

diff --git a/src/disabled-nl-qdisc-add.c b/src/disabled-nl-qdisc-add.c
index be19f9bfdbc915264aaec8ae362e3e2d518cecbb..a1fab4e20d1117d0be2ebdd338368ce61a9c6a63 100644 (file)
--- a/src/disabled-nl-qdisc-add.c
+++ b/src/disabled-nl-qdisc-add.c
@@ -125,7 +125,7 @@ usage:
 
 int main(int argc, char *argv[])
 {
-       struct nl_handle *nlh;
+       struct nl_sock *nlh;
        struct rtnl_qdisc *qdisc;
        uint32_t handle, parent;
        int err = 1;

diff --git a/src/nl-addr-delete.c b/src/nl-addr-delete.c
index 42111916caf63df476ac0f5d70173191635345b5..f18556389c6185cc0dd5173fcb188131e435c81b 100644 (file)
--- a/src/nl-addr-delete.c
+++ b/src/nl-addr-delete.c
@@ -10,7 +10,7 @@
 
 #include "addr-utils.h"
 
-static struct nl_handle *sock;
+static struct nl_sock *sock;
 static int interactive = 0, default_yes = 0, quiet = 0;
 static int deleted = 0;
 

diff --git a/src/nl-addr-list.c b/src/nl-addr-list.c
index 0a3fb64a9e2091c73722cf2a59596f8798551f22..1393f6e21569adb276055846d206a370fc12730b 100644 (file)
--- a/src/nl-addr-list.c
+++ b/src/nl-addr-list.c
@@ -108,7 +108,7 @@ static void env_dump(struct nl_object *obj, void *arg)
 
 int main(int argc, char *argv[])
 {
-       struct nl_handle *sock;
+       struct nl_sock *sock;
        struct rtnl_addr *addr;
        struct nl_cache *link_cache, *addr_cache;
        struct nl_dump_params params = {

diff --git a/src/nl-fib-lookup.c b/src/nl-fib-lookup.c
index c514211cb5430c016c86a09e3adde596f0072388..328e60fb32cf06623466dc95bb7ffe11b5beb060 100644 (file)
--- a/src/nl-fib-lookup.c
+++ b/src/nl-fib-lookup.c
@@ -25,7 +25,7 @@ static void print_usage(void)
 
 int main(int argc, char *argv[])
 {
-       struct nl_handle *nlh;
+       struct nl_sock *nlh;
        struct nl_cache *result;
        struct flnl_request *request;
        struct nl_addr *addr;

diff --git a/src/nl-route-add.c b/src/nl-route-add.c
index 47475a105c3e974962081cb9c0d5c0c747470e4b..a1ab7f3ff1f805e458e0a255bda0f9d0608f0599 100644 (file)
--- a/src/nl-route-add.c
+++ b/src/nl-route-add.c
@@ -49,7 +49,7 @@ static void print_usage(void)
 
 int main(int argc, char *argv[])
 {
-       struct nl_handle *sock;
+       struct nl_sock *sock;
        struct rtnl_route *route;
        struct nl_dump_params dp = {
                .dp_type = NL_DUMP_LINE,

diff --git a/src/nl-route-delete.c b/src/nl-route-delete.c
index 81cec5856b2f27b302bad8591a1b5cfc68ef99ef..aca3a39f8fb093e2a69bedebff91693087a58671 100644 (file)
--- a/src/nl-route-delete.c
+++ b/src/nl-route-delete.c
@@ -13,7 +13,7 @@
 
 static int interactive = 0, default_yes = 0, quiet = 0;
 static int deleted = 0;
-static struct nl_handle *sock;
+static struct nl_sock *sock;
 
 static void print_version(void)
 {

diff --git a/tests/test-socket-creation.c b/tests/test-socket-creation.c
index 4066eef97505e11fb38d0e17fb88ad3e7c150488..a170ccd67d7ba44f6278c0f5f3e840295c9c4f54 100644 (file)
--- a/tests/test-socket-creation.c
+++ b/tests/test-socket-creation.c
@@ -2,7 +2,7 @@
 
 int main(int argc, char *argv[])
 {
-       struct nl_handle *h[1025];
+       struct nl_sock *h[1025];
        int i;
 
        h[0] = nl_handle_alloc();