diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-07-28 16:05:06 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-07-31 13:18:09 (GMT) |
| commit | befc4ab4d79d7db90d036465c490a88da1c8734b (patch) | |
| tree | c7f3fc87fac81471fcc2c5884d856add5963a889 | |
| parent | f6c26127f2dee628490e9b8fa155380e70b1b638 (diff) | |
| download | libnl-befc4ab4d79d7db90d036465c490a88da1c8734b.zip libnl-befc4ab4d79d7db90d036465c490a88da1c8734b.tar.gz libnl-befc4ab4d79d7db90d036465c490a88da1c8734b.tar.bz2 | |
include: move "include/netlink-private/genl.h" to "lib/genl/nl-priv-genl.h"
This header is entirely private to the source files in "lib/genl".
It's confusing to keep it separate. Place it beside the source files,
which can use it.
I guess, I just disagree with this notion, that all headers must be
under "include/" directory. Not, if the header is entirely local to one
module.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | lib/genl/ctrl.c | 2 | ||||
| -rw-r--r-- | lib/genl/family.c | 2 | ||||
| -rw-r--r-- | lib/genl/genl.c | 2 | ||||
| -rw-r--r-- | lib/genl/mngt.c | 2 | ||||
| -rw-r--r-- | lib/genl/nl-priv-genl.h (renamed from include/netlink-private/genl.h) | 0 | ||||
| -rwxr-xr-x | tools/clang-format.sh | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 030bb4b..4aa82c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,7 +272,6 @@ noinst_HEADERS = \ include/linux-private/linux/veth.h \ include/linux-private/linux/xfrm.h \ include/netlink-private/cache-api.h \ - include/netlink-private/genl.h \ include/netlink-private/netlink.h \ include/netlink-private/object-api.h \ include/netlink-private/route/link/api.h \ @@ -507,6 +506,7 @@ lib_libnl_genl_3_la_SOURCES = \ lib/genl/family.c \ lib/genl/genl.c \ lib/genl/mngt.c \ + lib/genl/nl-priv-genl.h \ $(NULL) EXTRA_lib_libnl_genl_3_la_DEPENDENCIES = \ libnl-genl-3.sym diff --git a/lib/genl/ctrl.c b/lib/genl/ctrl.c index a07b42e..ca996e3 100644 --- a/lib/genl/ctrl.c +++ b/lib/genl/ctrl.c @@ -15,7 +15,7 @@ * @{ */ -#include <netlink-private/genl.h> +#include "nl-priv-genl.h" #include <netlink/netlink.h> #include <netlink/genl/genl.h> #include <netlink/genl/family.h> diff --git a/lib/genl/family.c b/lib/genl/family.c index 363cc30..055cb20 100644 --- a/lib/genl/family.c +++ b/lib/genl/family.c @@ -12,7 +12,7 @@ * @{ */ -#include <netlink-private/genl.h> +#include "nl-priv-genl.h" #include <netlink/netlink.h> #include <netlink/genl/genl.h> #include <netlink/genl/family.h> diff --git a/lib/genl/genl.c b/lib/genl/genl.c index 4fd7962..ac38c98 100644 --- a/lib/genl/genl.c +++ b/lib/genl/genl.c @@ -9,7 +9,7 @@ * @{ */ -#include <netlink-private/genl.h> +#include "nl-priv-genl.h" #include <netlink/netlink.h> #include <netlink/genl/genl.h> #include <netlink/utils.h> diff --git a/lib/genl/mngt.c b/lib/genl/mngt.c index 50b9ac7..047048b 100644 --- a/lib/genl/mngt.c +++ b/lib/genl/mngt.c @@ -12,7 +12,7 @@ * @{ */ -#include <netlink-private/genl.h> +#include "nl-priv-genl.h" #include <netlink/netlink.h> #include <netlink/genl/genl.h> #include <netlink/genl/mngt.h> diff --git a/include/netlink-private/genl.h b/lib/genl/nl-priv-genl.h index ac592bd..ac592bd 100644 --- a/include/netlink-private/genl.h +++ b/lib/genl/nl-priv-genl.h diff --git a/tools/clang-format.sh b/tools/clang-format.sh index 083de24..c80033e 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -15,7 +15,6 @@ EXCLUDE_PATHS_TOPLEVEL=( # Exclude them too. EXCLUDE_PATHS_TOPLEVEL+=( "include/netlink-private/cache-api.h" - "include/netlink-private/genl.h" "include/netlink-private/netlink.h" "include/netlink-private/object-api.h" "include/netlink-private/route/link/api.h" @@ -168,6 +167,7 @@ EXCLUDE_PATHS_TOPLEVEL+=( "lib/genl/family.c" "lib/genl/genl.c" "lib/genl/mngt.c" + "lib/genl/nl-priv-genl.h" "lib/handlers.c" "lib/hash.c" "lib/hashtable.c" |