From 74bdaf1ad899a8dcb8e8d4a29eed2fceee2cc502 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 3 Dec 2014 17:29:54 +0100 Subject: [PATCH] libnm: hide nm_utils_uuid_generate_from_string() from public API --- libnm-core/nm-core-internal.h | 5 +++++ libnm-core/nm-utils.h | 4 ---- libnm/libnm.ver | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index c0bbd71eac..5af90267a5 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -117,6 +117,11 @@ char ** _nm_utils_strsplit_set (const char *str, const char *delimiters, int max_tokens); +#define NM_UTILS_UUID_TYPE_LEGACY 0 +#define NM_UTILS_UUID_TYPE_VARIANT3 1 + +char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args); + void _nm_dbus_errors_init (void); extern gboolean _nm_utils_is_manager_process; diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index fe67bc3384..a9ecd5ec90 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -120,11 +120,7 @@ GVariant *nm_utils_ip_routes_to_variant (GPtrArray *routes); GPtrArray *nm_utils_ip_routes_from_variant (GVariant *value, int family); -#define NM_UTILS_UUID_TYPE_LEGACY 0 -#define NM_UTILS_UUID_TYPE_VARIANT3 1 - char *nm_utils_uuid_generate (void); -char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args); gboolean nm_utils_file_is_certificate (const char *filename); gboolean nm_utils_file_is_private_key (const char *filename, gboolean *out_encrypted); diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 58d886029d..d89e478d00 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -793,7 +793,6 @@ global: nm_utils_security_valid; nm_utils_ssid_to_utf8; nm_utils_uuid_generate; - nm_utils_uuid_generate_from_string; nm_utils_wep_key_valid; nm_utils_wifi_channel_to_freq; nm_utils_wifi_find_next_channel;