From aea053db38ffd00c223e5cc1b5d3f2b342fc9870 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 20 Sep 2022 12:38:03 +0200
Subject: [PATCH] platform: add "nmp-plobj.[hc]"

Our naming in libnm-platform is bad.

We have NMPlatform, which is a cache of objects. Consequently we have
platform methods like nm_platform_get_link().

We also have various other types that share the NMPlatform prefix, like
NMPlatformIP4Address. For those we have nm_platform_ip4_address_to_string().

"methods" of a type should have the same prefix as the type,
and we should not have types that share the same prefix.

Also, "NMPlatformIP4Address" is a long name, and inconsistent with the
strongly related NMPObjectIP4Address.

Add new files to move and rename parts of the platform API.
---
 Makefile.am                    | 2 ++
 src/libnm-platform/meson.build | 1 +
 src/libnm-platform/nmp-plobj.c | 9 +++++++++
 src/libnm-platform/nmp-plobj.h | 9 +++++++++
 4 files changed, 21 insertions(+)
 create mode 100644 src/libnm-platform/nmp-plobj.c
 create mode 100644 src/libnm-platform/nmp-plobj.h

diff --git a/Makefile.am b/Makefile.am
index 843ad3cfcb..11450fdda2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -614,6 +614,8 @@ src_libnm_platform_libnm_platform_la_SOURCES = \
 	src/libnm-platform/nmp-netns.h \
 	src/libnm-platform/nmp-object.c \
 	src/libnm-platform/nmp-object.h \
+	src/libnm-platform/nmp-plobj.c \
+	src/libnm-platform/nmp-plobj.h \
 	src/libnm-platform/wifi/nm-wifi-utils-nl80211.c \
 	src/libnm-platform/wifi/nm-wifi-utils-nl80211.h \
 	src/libnm-platform/wifi/nm-wifi-utils-private.h \
diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build
index e273046f10..90df2bc7c3 100644
--- a/src/libnm-platform/meson.build
+++ b/src/libnm-platform/meson.build
@@ -10,6 +10,7 @@ libnm_platform = static_library(
     'nmp-global-tracker.c',
     'nmp-netns.c',
     'nmp-object.c',
+    'nmp-plobj.c',
     'wifi/nm-wifi-utils-nl80211.c',
     'wifi/nm-wifi-utils.c',
     'wpan/nm-wpan-utils.c',
diff --git a/src/libnm-platform/nmp-plobj.c b/src/libnm-platform/nmp-plobj.c
new file mode 100644
index 0000000000..d6e8fc2c10
--- /dev/null
+++ b/src/libnm-platform/nmp-plobj.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2015 - 2018 Red Hat, Inc.
+ */
+
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
+
+#include "nmp-plobj.h"
+
diff --git a/src/libnm-platform/nmp-plobj.h b/src/libnm-platform/nmp-plobj.h
new file mode 100644
index 0000000000..e18983f187
--- /dev/null
+++ b/src/libnm-platform/nmp-plobj.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2015 - 2018 Red Hat, Inc.
+ */
+
+#ifndef __NMP_PLOBJ_H__
+#define __NMP_PLOBJ_H__
+
+#endif /* __NMP_PLOBJ_H__ */