diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-12-03 17:35:15 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-12-03 17:36:08 +0100 |
| commit | 6d6c433bab3dee9093813eefeb5087a4a6337267 (patch) | |
| tree | e29b0f0a7d4f44363fac10f42a7edb1f8c74f2ae | |
| parent | 0e727062fc4556a504d83615ae510982dea4a8ee (diff) | |
| download | NetworkManager-6d6c433bab3dee9093813eefeb5087a4a6337267.tar.gz | |
ifcfg-rh: don't include nm-utils-private.h outside of libnm-core/
| -rw-r--r-- | libnm-core/nm-core-internal.h | 4 | ||||
| -rw-r--r-- | libnm-core/nm-utils-private.h | 4 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 769591065b..f4f4fe4c75 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -113,6 +113,10 @@ GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array); gboolean _nm_utils_string_in_list (const char *str, const char **valid_strings); +char ** _nm_utils_strsplit_set (const char *str, + const char *delimiters, + int max_tokens); + void _nm_dbus_errors_init (void); extern gboolean _nm_utils_is_manager_process; diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h index 4a4e82e0d9..3854d67951 100644 --- a/libnm-core/nm-utils-private.h +++ b/libnm-core/nm-utils-private.h @@ -46,10 +46,6 @@ char ** _nm_utils_slist_to_strv (GSList *slist); GPtrArray * _nm_utils_strv_to_ptrarray (char **strv); char ** _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray); -char ** _nm_utils_strsplit_set (const char *str, - const char *delimiters, - int max_tokens); - char * _nm_utils_hwaddr_canonical_or_invalid (const char *mac, gssize length); #endif diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index d293d741cb..8a35b9472a 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -50,7 +50,6 @@ #include <nm-setting-dcb.h> #include <nm-setting-generic.h> #include "nm-core-internal.h" -#include "nm-utils-private.h" #include <nm-utils.h> #include "nm-platform.h" |