From b5195db9e5e0defe18acc8f5772c8e9c865b2c01 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 2 Aug 2023 12:15:03 +0200
Subject: genl: rename private header "nl-priv-genl.h" to "nl-genl.h"

The filename is still unique (which is the important part). Otherwise,
the "priv" is redundant, since the header being inside "lib/genl" is clearly
private.
---
 Makefile.am             |  2 +-
 lib/genl/ctrl.c         |  2 +-
 lib/genl/family.c       |  2 +-
 lib/genl/genl.c         |  2 +-
 lib/genl/mngt.c         |  2 +-
 lib/genl/nl-genl.h      | 17 +++++++++++++++++
 lib/genl/nl-priv-genl.h | 17 -----------------
 tools/clang-format.sh   |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 lib/genl/nl-genl.h
 delete mode 100644 lib/genl/nl-priv-genl.h

diff --git a/Makefile.am b/Makefile.am
index 249e997..7aa2b59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -509,7 +509,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 \
+	lib/genl/nl-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 ca996e3..999df71 100644
--- a/lib/genl/ctrl.c
+++ b/lib/genl/ctrl.c
@@ -15,7 +15,7 @@
  * @{
  */
 
-#include "nl-priv-genl.h"
+#include "nl-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 055cb20..b729c5c 100644
--- a/lib/genl/family.c
+++ b/lib/genl/family.c
@@ -12,7 +12,7 @@
  * @{
  */
 
-#include "nl-priv-genl.h"
+#include "nl-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 ac38c98..d2b0c30 100644
--- a/lib/genl/genl.c
+++ b/lib/genl/genl.c
@@ -9,7 +9,7 @@
  * @{
  */
 
-#include "nl-priv-genl.h"
+#include "nl-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 82ba0be..b3e633d 100644
--- a/lib/genl/mngt.c
+++ b/lib/genl/mngt.c
@@ -12,7 +12,7 @@
  * @{
  */
 
-#include "nl-priv-genl.h"
+#include "nl-genl.h"
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/mngt.h>
diff --git a/lib/genl/nl-genl.h b/lib/genl/nl-genl.h
new file mode 100644
index 0000000..ad85047
--- /dev/null
+++ b/lib/genl/nl-genl.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+/*
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_PRIV_H_
+#define NETLINK_GENL_PRIV_H_
+
+#include <netlink-private/netlink.h>
+#include <netlink/netlink.h>
+
+#define GENL_HDRSIZE(hdrlen) (GENL_HDRLEN + (hdrlen))
+
+/* WARNING: this symbol is wrongly exported in libnl-genl-3.sym. */
+extern int		genl_resolve_id(struct genl_ops *ops);
+
+#endif
diff --git a/lib/genl/nl-priv-genl.h b/lib/genl/nl-priv-genl.h
deleted file mode 100644
index ad85047..0000000
--- a/lib/genl/nl-priv-genl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-only */
-/*
- * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
- */
-
-#ifndef NETLINK_GENL_PRIV_H_
-#define NETLINK_GENL_PRIV_H_
-
-#include <netlink-private/netlink.h>
-#include <netlink/netlink.h>
-
-#define GENL_HDRSIZE(hdrlen) (GENL_HDRLEN + (hdrlen))
-
-/* WARNING: this symbol is wrongly exported in libnl-genl-3.sym. */
-extern int		genl_resolve_id(struct genl_ops *ops);
-
-#endif
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index e4b22f0..588c734 100755
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -160,7 +160,7 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "lib/genl/family.c"
     "lib/genl/genl.c"
     "lib/genl/mngt.c"
-    "lib/genl/nl-priv-genl.h"
+    "lib/genl/nl-genl.h"
     "lib/handlers.c"
     "lib/hash.c"
     "lib/hashtable.c"
-- 
cgit v0.12