From 2fcabf5699cb612a04167e4eba1a89be73a4956b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 2 May 2021 21:47:22 +0200 Subject: [PATCH] all: only include "libnm-glib-aux/nm-uuid.h" where needed Don't let "nm-core-internal.h" (which is a very popular header itself) drag in "nm-uuid.h". --- src/core/NetworkManagerUtils.c | 1 + src/core/devices/bluetooth/nm-bluez-manager.c | 1 + src/core/devices/nm-device-ethernet.c | 1 + src/core/devices/nm-device.c | 1 + src/core/devices/wifi/nm-iwd-manager.c | 1 + src/core/nm-core-utils.c | 1 + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 1 + src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 1 + src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c | 1 + src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c | 1 + src/core/systemd/nm-sd-utils-core.c | 2 +- src/core/tests/test-core.c | 1 + src/libnm-core-impl/nm-connection.c | 1 + src/libnm-core-impl/nm-keyfile.c | 1 + src/libnm-core-impl/nm-utils.c | 1 + src/libnm-core-impl/tests/test-general.c | 1 + src/libnm-core-impl/tests/test-setting.c | 1 + src/libnm-core-intern/nm-core-internal.h | 1 - src/nm-initrd-generator/nmi-cmdline-reader.c | 1 + src/nm-initrd-generator/nmi-ibft-reader.c | 1 + 20 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 700acf37d9..6a58289c67 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -14,6 +14,7 @@ #include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-base/nm-net-aux.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils.h" diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index 123591e1a1..953c1fd070 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -12,6 +12,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-dbus-aux.h" #include "libnm-glib-aux/nm-c-list.h" #include "nm-dbus-manager.h" diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 64b526add6..abe875334d 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -14,6 +14,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "nm-device-private.h" #include "nm-act-request.h" #include "nm-ip4-config.h" diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index b8819a4bbd..0aa0d3c7dc 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -24,6 +24,7 @@ #include #include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-dedup-multi.h" #include "libnm-glib-aux/nm-random-utils.h" #include "libnm-systemd-shared/nm-sd-utils-shared.h" diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c index 9ede0311c0..b65022c346 100644 --- a/src/core/devices/wifi/nm-iwd-manager.c +++ b/src/core/devices/wifi/nm-iwd-manager.c @@ -16,6 +16,7 @@ #include "nm-manager.h" #include "nm-device-iwd.h" #include "nm-wifi-utils.h" +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-random-utils.h" #include "libnm-glib-aux/nm-io-utils.h" #include "settings/nm-settings.h" diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 53cd3d9501..15cf4d8183 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -22,6 +22,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-platform/nmp-base.h" #include "libnm-std-aux/unaligned.h" #include "libnm-glib-aux/nm-random-utils.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 3447ee910b..19e672e0bd 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -18,6 +18,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-secret-utils.h" #include "nm-connection.h" #include "nm-dbus-interface.h" diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index e0a265bed9..073e4c3356 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -17,6 +17,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-json-aux.h" #include "nm-utils.h" #include "nm-setting-connection.h" diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c index 099ad3a77e..db6b1aefb7 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -12,6 +12,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-core-intern/nm-core-internal.h" #include "settings/nm-settings-plugin.h" diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index f6480e67d8..a13c25864f 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -15,6 +15,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-core-intern/nm-core-internal.h" #include "settings/plugins/keyfile/nms-keyfile-reader.h" diff --git a/src/core/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c index b81e36f377..451e8b600b 100644 --- a/src/core/systemd/nm-sd-utils-core.c +++ b/src/core/systemd/nm-sd-utils-core.c @@ -7,7 +7,7 @@ #include "nm-sd-utils-core.h" -#include "libnm-core-intern/nm-core-internal.h" +#include "libnm-glib-aux/nm-uuid.h" #include "nm-sd-adapt-core.h" diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index f212886331..d7f733066a 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -11,6 +11,7 @@ /* need math.h for isinf() and INFINITY. No need to link with -lm */ #include +#include "libnm-glib-aux/nm-uuid.h" #include "NetworkManagerUtils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 960a34fcc0..8abfa65e51 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -10,6 +10,7 @@ #include +#include "libnm-glib-aux/nm-uuid.h" #include "nm-connection-private.h" #include "nm-utils.h" #include "nm-setting-private.h" diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 6c1d6bf83c..3bd87c5fb4 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -18,6 +18,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-str-buf.h" #include "libnm-glib-aux/nm-secret-utils.h" #include "libnm-systemd-shared/nm-sd-utils-shared.h" diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 4c4d98d25b..39248378ff 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -17,6 +17,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-json-aux.h" #include "libnm-glib-aux/nm-str-buf.h" #include "libnm-glib-aux/nm-enum-utils.h" diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index fd95f3d85c..67b6ab482f 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -14,6 +14,7 @@ #include #include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-enum-utils.h" #include "libnm-glib-aux/nm-str-buf.h" #include "libnm-glib-aux/nm-json-aux.h" diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index b64bf79612..c175a816c8 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -8,6 +8,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-glib-aux/nm-json-aux.h" #include "libnm-base/nm-ethtool-utils-base.h" #include "libnm-core-intern/nm-core-internal.h" diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 03c2cbb5b4..c186fe1229 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -21,7 +21,6 @@ #endif #include "libnm-base/nm-base.h" -#include "libnm-glib-aux/nm-uuid.h" #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-meta-setting-base.h" diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index eaaed73143..799fd5dcc0 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -8,6 +8,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-log-core/nm-logging.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-initrd-generator.h" diff --git a/src/nm-initrd-generator/nmi-ibft-reader.c b/src/nm-initrd-generator/nmi-ibft-reader.c index cb7c57eca4..b3db3f0180 100644 --- a/src/nm-initrd-generator/nmi-ibft-reader.c +++ b/src/nm-initrd-generator/nmi-ibft-reader.c @@ -17,6 +17,7 @@ #include #include +#include "libnm-glib-aux/nm-uuid.h" #include "libnm-log-core/nm-logging.h" #include "libnm-core-intern/nm-core-internal.h" #include "libnm-platform/nm-platform-utils.h"