From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Sep 2021 02:51:17 +0000 (+0900)
Subject: sd-lldp: rename sd-lldp.[ch] -> sd-lldp-rx.[ch]
X-Git-Tag: v250-rc1~613^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a2ee8554ef675c60d00807e5ef4131e2803ac95;p=thirdparty%2Fsystemd.git

sd-lldp: rename sd-lldp.[ch] -> sd-lldp-rx.[ch]
---

diff --git a/src/libsystemd-network/fuzz-lldp.c b/src/libsystemd-network/fuzz-lldp.c
index 5747135b32f..6c4d3e2e566 100644
--- a/src/libsystemd-network/fuzz-lldp.c
+++ b/src/libsystemd-network/fuzz-lldp.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "sd-event.h"
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 
 #include "fd-util.h"
 #include "fuzz.h"
diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c
index 3bd775158ef..ba5f288aa5c 100644
--- a/src/libsystemd-network/lldp-neighbor.c
+++ b/src/libsystemd-network/lldp-neighbor.c
@@ -5,7 +5,6 @@
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
 #include "in-addr-util.h"
-#include "lldp-internal.h"
 #include "lldp-neighbor.h"
 #include "memory-util.h"
 #include "missing_network.h"
diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h
index a5718c8c31e..82735ee0c3e 100644
--- a/src/libsystemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/lldp-neighbor.h
@@ -5,10 +5,10 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 
 #include "hash-funcs.h"
-#include "lldp-internal.h"
+#include "lldp-rx-internal.h"
 #include "time-util.h"
 
 typedef struct LLDPNeighborID {
diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-rx-internal.h
similarity index 98%
rename from src/libsystemd-network/lldp-internal.h
rename to src/libsystemd-network/lldp-rx-internal.h
index cf0578c5c29..ad6ee5a7e22 100644
--- a/src/libsystemd-network/lldp-internal.h
+++ b/src/libsystemd-network/lldp-rx-internal.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "sd-event.h"
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 
 #include "hashmap.h"
 #include "log-link.h"
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 83f902ebbf6..df0bc4d8c2a 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -20,11 +20,11 @@ sources = files('''
         dhcp6-protocol.h
         icmp6-util.c
         icmp6-util.h
-        lldp-internal.h
         lldp-neighbor.c
         lldp-neighbor.h
         lldp-network.c
         lldp-network.h
+        lldp-rx-internal.h
         ndisc-internal.h
         ndisc-router.c
         ndisc-router.h
@@ -40,7 +40,7 @@ sources = files('''
         sd-dhcp6-lease.c
         sd-ipv4acd.c
         sd-ipv4ll.c
-        sd-lldp.c
+        sd-lldp-rx.c
         sd-ndisc.c
         sd-radv.c
 '''.split())
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp-rx.c
similarity index 99%
rename from src/libsystemd-network/sd-lldp.c
rename to src/libsystemd-network/sd-lldp-rx.c
index b38d6dbd1e3..06861c0d41f 100644
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp-rx.c
@@ -4,15 +4,15 @@
 #include <linux/sockios.h>
 #include <sys/ioctl.h>
 
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 
 #include "alloc-util.h"
 #include "ether-addr-util.h"
 #include "event-util.h"
 #include "fd-util.h"
-#include "lldp-internal.h"
 #include "lldp-neighbor.h"
 #include "lldp-network.h"
+#include "lldp-rx-internal.h"
 #include "memory-util.h"
 #include "network-common.h"
 #include "socket-util.h"
diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c
index 0331e387f03..09aacfd9fba 100644
--- a/src/libsystemd-network/test-lldp.c
+++ b/src/libsystemd-network/test-lldp.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 
 #include "sd-event.h"
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 09a19192bcf..d4a7da9f71f 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -15,7 +15,7 @@
 #include "sd-device.h"
 #include "sd-dhcp-client.h"
 #include "sd-hwdb.h"
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 #include "sd-netlink.h"
 #include "sd-network.h"
 
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 7190310a132..4946452e281 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -11,7 +11,7 @@
 #include "sd-dhcp6-client.h"
 #include "sd-ipv4acd.h"
 #include "sd-ipv4ll.h"
-#include "sd-lldp.h"
+#include "sd-lldp-rx.h"
 #include "sd-ndisc.h"
 #include "sd-radv.h"
 #include "sd-netlink.h"
diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index b7b536f3b54..a13c8d7a7b9 100644
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -5,7 +5,7 @@
 #include "dhcp6-protocol.h"
 #include "ethtool-util.h"
 #include "ipvlan.h"
-#include "lldp-internal.h"
+#include "lldp-rx-internal.h"
 #include "macvlan.h"
 #include "ndisc-internal.h"
 #include "networkd-link.h"
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 6cae6a5767c..a854887ecc7 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -28,7 +28,7 @@ _not_installed_headers = '''
         sd-dhcp-server.h
         sd-ipv4acd.h
         sd-ipv4ll.h
-        sd-lldp.h
+        sd-lldp-rx.h
         sd-ndisc.h
         sd-netlink.h
         sd-network.h
diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp-rx.h
similarity index 99%
rename from src/systemd/sd-lldp.h
rename to src/systemd/sd-lldp-rx.h
index 64047ee8171..ac4bb6018ca 100644
--- a/src/systemd/sd-lldp.h
+++ b/src/systemd/sd-lldp-rx.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
-#ifndef foosdlldphfoo
-#define foosdlldphfoo
+#ifndef foosdlldprxhfoo
+#define foosdlldprxhfoo
 
 /***
   systemd is free software; you can redistribute it and/or modify it