managelink -> hanlelink

diff --git a/dhcpcd.c b/dhcpcd.c
index bccc24964163fa5678193a6551c7693e59f4858d..31204d951fa4a80628a8dfe225697bc05cdb2e0b 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -986,13 +986,13 @@ dhcpcd_activateinterface(struct interface *ifp, unsigned long long options)
 }
 
 static void
-handle_link(void *arg)
+dhcpcd_handlelink(void *arg)
 {
        struct dhcpcd_ctx *ctx;
 
        ctx = arg;
-       if (if_managelink(ctx) == -1) {
-               logger(ctx, LOG_ERR, "if_managelink: %m");
+       if (if_handlelink(ctx) == -1) {
+               logger(ctx, LOG_ERR, "if_handlelink: %m");
                eloop_event_delete(ctx->eloop, ctx->link_fd);
                close(ctx->link_fd);
                ctx->link_fd = -1;
@@ -1828,7 +1828,7 @@ printpidfile:
 
        /* Start handling kernel messages for interfaces, addreses and
         * routes. */
-       eloop_event_add(ctx.eloop, ctx.link_fd, handle_link, &ctx);
+       eloop_event_add(ctx.eloop, ctx.link_fd, dhcpcd_handlelink, &ctx);
 
        /* Start any dev listening plugin which may want to
         * change the interface name provided by the kernel */

diff --git a/if-bsd.c b/if-bsd.c
index 1682f27ec9b064a02a57ca08ed3969a77c4b21ec..3973453ef52cf856c310ce085c0321041564b533 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -1227,7 +1227,7 @@ if_getlifetime6(struct ipv6_addr *ia)
 #endif
 
 int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
 {
        /* route and ifwatchd like a msg buf size of 2048 */
        char msg[2048], *p, *e, *cp;

diff --git a/if-linux.c b/if-linux.c
index 4085b9f0da94007d028e5779739db37a005b5d12..4bb800bc75041be6d45daed25603585877e95d83 100644 (file)
--- a/if-linux.c
+++ b/if-linux.c
@@ -885,7 +885,7 @@ link_netlink(struct dhcpcd_ctx *ctx, struct interface *ifp,
 }
 
 int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
 {
 
        return get_netlink(ctx, NULL,

diff --git a/if-sun.c b/if-sun.c
index 35c92dd06cf6638f7823c414f2ed5b0393dab963..33ce9ab7213d5153dc96ffe401b9c904829d40b4 100644 (file)
--- a/if-sun.c
+++ b/if-sun.c
@@ -136,7 +136,7 @@ if_vimaster(__unused const struct dhcpcd_ctx *ctx, __unused const char *ifname)
 }
 
 int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
 {
 
        UNUSED(ctx);

diff --git a/if.h b/if.h
index 0aaa47bde7df27ca76b3e48b57a1cfc7f6be8ad6..078cc8adca98efe20caaf08be381392686ab643d 100644 (file)
--- a/if.h
+++ b/if.h
@@ -111,7 +111,7 @@ int if_opensockets(struct dhcpcd_ctx *);
 int if_opensockets_os(struct dhcpcd_ctx *);
 void if_closesockets(struct dhcpcd_ctx *);
 void if_closesockets_os(struct dhcpcd_ctx *);
-int if_managelink(struct dhcpcd_ctx *);
+int if_handlelink(struct dhcpcd_ctx *);
 
 /* dhcpcd uses the same routing flags as BSD.
  * If the platform doesn't use these flags,