diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-08-01 07:55:43 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-08-01 08:34:27 (GMT) |
| commit | fad34560666d72ba82dd4ccaebd1b465e1aa3d65 (patch) | |
| tree | 25b2872a0c31786018d731ea8f4ae8d513cd48e6 | |
| parent | ed2be5373f6ffb1ecec15356fddf5c0dfc28b357 (diff) | |
| download | libnl-fad34560666d72ba82dd4ccaebd1b465e1aa3d65.zip libnl-fad34560666d72ba82dd4ccaebd1b465e1aa3d65.tar.gz libnl-fad34560666d72ba82dd4ccaebd1b465e1aa3d65.tar.bz2 | |
lib: move "include/netlink-private/cache-api" to include/nl-shared-core
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | include/netlink-private/netlink.h | 2 | ||||
| -rw-r--r-- | include/nl-shared-core/README.md | 8 | ||||
| -rw-r--r-- | include/nl-shared-core/cache-api.h (renamed from include/netlink-private/cache-api.h) | 0 | ||||
| -rw-r--r-- | tests/test-cache-mngr.c | 2 | ||||
| -rwxr-xr-x | tools/clang-format.sh | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index cd5d09d..d85b0fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -271,7 +271,6 @@ noinst_HEADERS = \ include/linux-private/linux/tc_ematch/tc_em_meta.h \ include/linux-private/linux/veth.h \ include/linux-private/linux/xfrm.h \ - include/netlink-private/cache-api.h \ include/netlink-private/netlink.h \ include/netlink-private/object-api.h \ include/netlink-private/types.h \ @@ -279,6 +278,7 @@ noinst_HEADERS = \ include/nl-aux-route/nl-route.h \ include/nl-hidden-route/nl-hidden-route.h \ include/nl-intern-route/nl-intern-route.h \ + include/nl-shared-core/cache-api.h \ $(NULL) ############################################################################### diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h index 8cb0019..22881d5 100644 --- a/include/netlink-private/netlink.h +++ b/include/netlink-private/netlink.h @@ -59,9 +59,9 @@ #include <netlink/cache.h> #include <netlink/route/tc.h> #include <netlink-private/object-api.h> -#include <netlink-private/cache-api.h> #include <netlink-private/types.h> +#include "nl-shared-core/cache-api.h" #include "nl-aux-core/nl-core.h" #define NSEC_PER_SEC 1000000000L diff --git a/include/nl-shared-core/README.md b/include/nl-shared-core/README.md new file mode 100644 index 0000000..9f8ecb2 --- /dev/null +++ b/include/nl-shared-core/README.md @@ -0,0 +1,8 @@ +include/nl-shared-core +====================== + +Contains internal API on top of core (libnl-3). It is +implemented by core and usable to all users that link +against libnl-3. + +Note that the ABI, while being internal, should stay stable. diff --git a/include/netlink-private/cache-api.h b/include/nl-shared-core/cache-api.h index 38662b7..38662b7 100644 --- a/include/netlink-private/cache-api.h +++ b/include/nl-shared-core/cache-api.h diff --git a/tests/test-cache-mngr.c b/tests/test-cache-mngr.c index 33cbd8d..bae2d22 100644 --- a/tests/test-cache-mngr.c +++ b/tests/test-cache-mngr.c @@ -6,8 +6,6 @@ #include <sys/time.h> #include <time.h> -#include <netlink-private/cache-api.h> - #include <linux/netlink.h> static int quit = 0; diff --git a/tools/clang-format.sh b/tools/clang-format.sh index e6a0f50..33b5f17 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -14,7 +14,6 @@ EXCLUDE_PATHS_TOPLEVEL=( # The following files are currently not formatted with clang. # Exclude them too. EXCLUDE_PATHS_TOPLEVEL+=( - "include/netlink-private/cache-api.h" "include/netlink-private/netlink.h" "include/netlink-private/object-api.h" "include/netlink-private/types.h" @@ -137,6 +136,7 @@ EXCLUDE_PATHS_TOPLEVEL+=( "include/netlink/xfrm/selector.h" "include/netlink/xfrm/sp.h" "include/netlink/xfrm/template.h" + "include/nl-shared-core/cache-api.h" "lib/addr.c" "lib/attr.c" "lib/cache.c" |