sd-ipv4acd: fix namespacing

Prefix all exported constants with SD_IPV4ACD to prevent namespacing
conflicts.

diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index ee5d13c0301f40eb5c0ee69c59bbb2513fd4ec0a..95b96bfd52836260af25b22d4558b74000c59900 100644 (file)
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -179,7 +179,7 @@ int sd_ipv4acd_stop(sd_ipv4acd *ll) {
 
         ipv4acd_stop(ll);
 
-        ipv4acd_client_notify(ll, IPV4ACD_EVENT_STOP);
+        ipv4acd_client_notify(ll, SD_IPV4ACD_EVENT_STOP);
 
         return 0;
 }
@@ -315,7 +315,7 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata)
 
                 if (ll->iteration == 0) {
                         ll->conflict = 0;
-                        ipv4acd_client_notify(ll, IPV4ACD_EVENT_BIND);
+                        ipv4acd_client_notify(ll, SD_IPV4ACD_EVENT_BIND);
                 }
 
                 break;
@@ -345,7 +345,7 @@ static void ipv4acd_on_conflict(sd_ipv4acd *ll) {
 
         ipv4acd_stop(ll);
 
-        ipv4acd_client_notify(ll, IPV4ACD_EVENT_CONFLICT);
+        ipv4acd_client_notify(ll, SD_IPV4ACD_EVENT_CONFLICT);
 }
 
 static int ipv4acd_on_packet(sd_event_source *s, int fd,

diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index f065e3e3e0c7ff61126245db75a8434a16560bfa..c773e4d29f23e070849a32e4a2c6665a27325440 100644 (file)
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -297,18 +297,18 @@ void ipv4ll_on_acd(sd_ipv4acd *acd, int event, void *userdata) {
         assert(ll);
 
         switch (event) {
-        case IPV4ACD_EVENT_STOP:
+        case SD_IPV4ACD_EVENT_STOP:
                 ipv4ll_client_notify(ll, IPV4LL_EVENT_STOP);
 
                 ll->claimed_address = 0;
 
                 break;
-        case IPV4ACD_EVENT_BIND:
+        case SD_IPV4ACD_EVENT_BIND:
                 ll->claimed_address = ll->address;
                 ipv4ll_client_notify(ll, IPV4LL_EVENT_BIND);
 
                 break;
-        case IPV4ACD_EVENT_CONFLICT:
+        case SD_IPV4ACD_EVENT_CONFLICT:
                 /* if an address was already bound we must call up to the
                    user to handle this, otherwise we just try again */
                 if (ll->claimed_address != 0) {

diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index f1f14ee119c9371bee4e7cde80c504b0cdb05ef4..94c31af3f3d06f8cecc250df1e40faf740cdce22 100644 (file)
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -39,13 +39,13 @@ static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);
 
         switch (event) {
-        case IPV4ACD_EVENT_BIND:
+        case SD_IPV4ACD_EVENT_BIND:
                 log_info("bound");
                 break;
-        case IPV4ACD_EVENT_CONFLICT:
+        case SD_IPV4ACD_EVENT_CONFLICT:
                 log_info("conflict");
                 break;
-        case IPV4ACD_EVENT_STOP:
+        case SD_IPV4ACD_EVENT_STOP:
                 log_error("the client was stopped");
                 break;
         default:

diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h
index 8844ae848db9f0158da735dea4f488e3c195a18f..adcb2c7b920144f2d7abe51bd3a5577fa9f8652e 100644 (file)
--- a/src/systemd/sd-ipv4acd.h
+++ b/src/systemd/sd-ipv4acd.h
@@ -30,9 +30,9 @@
 #include "sd-event.h"
 
 enum {
-        IPV4ACD_EVENT_STOP           = 0,
-        IPV4ACD_EVENT_BIND           = 1,
-        IPV4ACD_EVENT_CONFLICT       = 2,
+        SD_IPV4ACD_EVENT_STOP           = 0,
+        SD_IPV4ACD_EVENT_BIND           = 1,
+        SD_IPV4ACD_EVENT_CONFLICT       = 2,
 };
 
 typedef struct sd_ipv4acd sd_ipv4acd;