From 07c9de48df2d136529a97243750b6f1d9061a098 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 5 May 2011 12:23:41 -0500 Subject: [PATCH] libnm-util: fix symbol export checks to catch un-exported ones too The current check caught stuff in the .ver file that was outdated, but didn't quite get stuff that was supposed to be exported but wasn't, in some cases. Update the regex to ensure that symbols that are not exported, but that start with "nm_" (and aren't GObject boilerplate) get flagged during the check. Update internal code to return to a previous pattern of treating symbols that start with "_" internal, and expecting symbols that start with "nm_" to be exported. Also fixes cases where random glibc symbols would get flagged: 00040ff4 l O *ABS* 00000000 .hidden _GLOBAL_OFFSET_TABLE_ 00041380 l O .data 00000000 .hidden __dso_handle 000406e8 l O .dtors 00000000 .hidden __DTOR_END__ 0000fbe4 l F .text 00000000 .hidden __i686.get_pc_thunk.cx 0002f980 l F .text 00000014 .hidden __stack_chk_fail_local 0000b1e7 l F .text 00000000 .hidden __i686.get_pc_thunk.bx 00040e60 l O *ABS* 00000000 .hidden _DYNAMIC --- libnm-util/libnm-util.ver | 1 + libnm-util/nm-param-spec-specialized.c | 98 +++++++++++++------------- libnm-util/nm-utils.c | 64 ++++++++--------- tools/check-exports.sh | 2 +- 4 files changed, 83 insertions(+), 82 deletions(-) diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index bb988bc467..4ff0838e39 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -130,6 +130,7 @@ global: nm_setting_802_1x_get_phase2_private_key_path; nm_setting_802_1x_get_phase2_private_key_scheme; nm_setting_802_1x_get_pin; + nm_setting_802_1x_get_pin_flags; nm_setting_802_1x_get_private_key_blob; nm_setting_802_1x_get_private_key_format; nm_setting_802_1x_get_private_key_password; diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index f5a362ce41..93623a1185 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -37,9 +37,9 @@ struct _NMParamSpecSpecialized { #include "nm-dbus-glib-types.h" /***********************************************************/ -/* nm_gvalues_compare */ +/* _gvalues_compare */ -static gint nm_gvalues_compare (const GValue *value1, const GValue *value2); +static gint _gvalues_compare (const GValue *value1, const GValue *value2); static gboolean type_is_fixed_size (GType type, gsize *tsize) @@ -86,7 +86,7 @@ type_is_fixed_size (GType type, gsize *tsize) #define FLOAT_FACTOR 0.00000001 static gint -nm_gvalues_compare_fixed (const GValue *value1, const GValue *value2) +_gvalues_compare_fixed (const GValue *value1, const GValue *value2) { int ret = 0; @@ -177,7 +177,7 @@ nm_gvalues_compare_fixed (const GValue *value1, const GValue *value2) } static gint -nm_gvalues_compare_string (const GValue *value1, const GValue *value2) +_gvalues_compare_string (const GValue *value1, const GValue *value2) { const char *str1 = g_value_get_string (value1); const char *str2 = g_value_get_string (value2); @@ -194,7 +194,7 @@ nm_gvalues_compare_string (const GValue *value1, const GValue *value2) } static gint -nm_gvalues_compare_strv (const GValue *value1, const GValue *value2) +_gvalues_compare_strv (const GValue *value1, const GValue *value2) { char **strv1; char **strv2; @@ -221,7 +221,7 @@ nm_gvalues_compare_strv (const GValue *value1, const GValue *value2) } static void -nm_gvalue_destroy (gpointer data) +_gvalue_destroy (gpointer data) { GValue *value = (GValue *) data; @@ -250,7 +250,7 @@ iterate_collection (const GValue *value, gpointer user_data) } static gint -nm_gvalues_compare_collection (const GValue *value1, const GValue *value2) +_gvalues_compare_collection (const GValue *value1, const GValue *value2) { gint ret; guint len1; @@ -287,12 +287,12 @@ nm_gvalues_compare_collection (const GValue *value1, const GValue *value2) for (iter1 = list1, iter2 = list2, ret = 0; ret == 0 && iter1 && iter2; iter1 = iter1->next, iter2 = iter2->next) - ret = nm_gvalues_compare ((GValue *) iter1->data, (GValue *) iter2->data); + ret = _gvalues_compare ((GValue *) iter1->data, (GValue *) iter2->data); } - g_slist_foreach (list1, (GFunc) nm_gvalue_destroy, NULL); + g_slist_foreach (list1, (GFunc) _gvalue_destroy, NULL); g_slist_free (list1); - g_slist_foreach (list2, (GFunc) nm_gvalue_destroy, NULL); + g_slist_foreach (list2, (GFunc) _gvalue_destroy, NULL); g_slist_free (list2); } @@ -325,13 +325,13 @@ compare_one_map_item (gpointer key, gpointer val, gpointer user_data) value2 = (GValue *) g_hash_table_lookup (info->hash2, key); if (value2) - info->ret = nm_gvalues_compare ((GValue *) val, value2); + info->ret = _gvalues_compare ((GValue *) val, value2); else info->ret = 1; } static gint -nm_gvalues_compare_map (const GValue *value1, const GValue *value2) +_gvalues_compare_map (const GValue *value1, const GValue *value2) { GHashTable *hash1 = NULL; GHashTable *hash2 = NULL; @@ -345,11 +345,11 @@ nm_gvalues_compare_map (const GValue *value1, const GValue *value2) return 0; } - hash1 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nm_gvalue_destroy); + hash1 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, _gvalue_destroy); dbus_g_type_map_value_iterate (value1, iterate_map, &hash1); len1 = g_hash_table_size (hash1); - hash2 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nm_gvalue_destroy); + hash2 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, _gvalue_destroy); dbus_g_type_map_value_iterate (value2, iterate_map, &hash2); len2 = g_hash_table_size (hash2); @@ -491,10 +491,10 @@ nm_gvalue_ip6_route_compare (const GValue *value1, const GValue *value2) } static gint -nm_gvalues_compare_struct (const GValue *value1, const GValue *value2) +_gvalues_compare_struct (const GValue *value1, const GValue *value2) { /* value1 and value2 must contain the same type since - * nm_gvalues_compare() enforced that already. + * _gvalues_compare() enforced that already. */ if (G_VALUE_HOLDS (value1, DBUS_TYPE_G_IP6_ADDRESS)) { @@ -508,7 +508,7 @@ nm_gvalues_compare_struct (const GValue *value1, const GValue *value2) } gint -nm_gvalues_compare (const GValue *value1, const GValue *value2) +_gvalues_compare (const GValue *value1, const GValue *value2) { GType type1; GType type2; @@ -528,9 +528,9 @@ nm_gvalues_compare (const GValue *value1, const GValue *value2) return type1 < type2 ? -1 : type1 > type2; if (type_is_fixed_size (type1, NULL)) - ret = nm_gvalues_compare_fixed (value1, value2); + ret = _gvalues_compare_fixed (value1, value2); else if (type1 == G_TYPE_STRING) - ret = nm_gvalues_compare_string (value1, value2); + ret = _gvalues_compare_string (value1, value2); else if (G_VALUE_HOLDS_BOXED (value1)) { gpointer p1 = g_value_get_boxed (value1); gpointer p2 = g_value_get_boxed (value2); @@ -542,15 +542,15 @@ nm_gvalues_compare (const GValue *value1, const GValue *value2) else if (!p2) ret = -1; /* The comparision functions below don't handle NULLs */ else if (type1 == G_TYPE_STRV) - ret = nm_gvalues_compare_strv (value1, value2); + ret = _gvalues_compare_strv (value1, value2); else if (dbus_g_type_is_collection (type1)) - ret = nm_gvalues_compare_collection (value1, value2); + ret = _gvalues_compare_collection (value1, value2); else if (dbus_g_type_is_map (type1)) - ret = nm_gvalues_compare_map (value1, value2); + ret = _gvalues_compare_map (value1, value2); else if (dbus_g_type_is_struct (type1)) - ret = nm_gvalues_compare_struct (value1, value2); + ret = _gvalues_compare_struct (value1, value2); else if (type1 == G_TYPE_VALUE) - ret = nm_gvalues_compare ((GValue *) g_value_get_boxed (value1), (GValue *) g_value_get_boxed (value2)); + ret = _gvalues_compare ((GValue *) g_value_get_boxed (value1), (GValue *) g_value_get_boxed (value2)); else { g_warning ("Don't know how to compare boxed types '%s'", g_type_name (type1)); ret = value1 == value2; @@ -596,7 +596,7 @@ param_specialized_values_cmp (GParamSpec *pspec, const GValue *value1, const GValue *value2) { - return nm_gvalues_compare (value1, value2); + return _gvalues_compare (value1, value2); } GType @@ -656,13 +656,13 @@ compare_ints (void) g_value_set_int (&value1, 5); g_value_set_int (&value2, 5); - g_print ("Comparing ints 5 and 5: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing ints 5 and 5: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_int (&value2, 10); - g_print ("Comparing ints 5 and 10: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing ints 5 and 10: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_int (&value2, 1); - g_print ("Comparing ints 5 and 1: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing ints 5 and 1: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -678,10 +678,10 @@ compare_strings (void) g_value_set_string (&value1, str1); g_value_set_string (&value2, str1); - g_print ("Comparing identical strings: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical strings: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_string (&value2, str2); - g_print ("Comparing different strings: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different strings: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -699,16 +699,16 @@ compare_strv (void) g_value_set_boxed (&value1, strv1); g_value_set_boxed (&value2, strv1); - g_print ("Comparing identical strv's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical strv's: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_boxed (&value2, strv2); - g_print ("Comparing different strv's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different strv's: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_boxed (&value2, strv3); - g_print ("Comparing different len (smaller) strv's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different len (smaller) strv's: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_boxed (&value2, strv4); - g_print ("Comparing different len (longer) strv's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different len (longer) strv's: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -734,16 +734,16 @@ compare_garrays (void) g_value_set_boxed (&value1, array1); g_value_set_boxed (&value2, array2); - g_print ("Comparing identical arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical arrays's: %d\n", _gvalues_compare (&value1, &value2)); g_array_remove_index (array2, 0); g_value_set_boxed (&value2, array2); - g_print ("Comparing different length arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different length arrays's: %d\n", _gvalues_compare (&value1, &value2)); i = 7; g_array_prepend_val (array2, i); g_value_set_boxed (&value2, array2); - g_print ("Comparing different arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different arrays's: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -768,15 +768,15 @@ compare_ptrarrays (void) g_ptr_array_add (array2, "world"); g_value_set_boxed (&value2, array2); - g_print ("Comparing identical ptr arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical ptr arrays's: %d\n", _gvalues_compare (&value1, &value2)); g_ptr_array_add (array2, "boo"); g_value_set_boxed (&value2, array2); - g_print ("Comparing different len ptr arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different len ptr arrays's: %d\n", _gvalues_compare (&value1, &value2)); g_ptr_array_add (array1, "booz"); g_value_set_boxed (&value1, array1); - g_print ("Comparing different ptr arrays's: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different ptr arrays's: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -801,15 +801,15 @@ compare_str_hash (void) g_value_set_boxed (&value1, hash1); g_value_set_boxed (&value2, hash2); - g_print ("Comparing identical str hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical str hashes: %d\n", _gvalues_compare (&value1, &value2)); g_hash_table_remove (hash2, "key2"); g_value_set_boxed (&value2, hash2); - g_print ("Comparing different length str hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different length str hashes: %d\n", _gvalues_compare (&value1, &value2)); g_hash_table_insert (hash2, "key2", "moon"); g_value_set_boxed (&value2, hash2); - g_print ("Comparing different str hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different str hashes: %d\n", _gvalues_compare (&value1, &value2)); } static GValue * @@ -858,15 +858,15 @@ compare_gvalue_hash (void) g_value_set_boxed (&value1, hash1); g_value_set_boxed (&value2, hash2); - g_print ("Comparing identical gvalue hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical gvalue hashes: %d\n", _gvalues_compare (&value1, &value2)); g_hash_table_remove (hash2, "key2"); g_value_set_boxed (&value2, hash2); - g_print ("Comparing different length str hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different length str hashes: %d\n", _gvalues_compare (&value1, &value2)); g_hash_table_insert (hash2, "key2", str_to_gvalue ("moon")); g_value_set_boxed (&value2, hash2); - g_print ("Comparing different str hashes: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different str hashes: %d\n", _gvalues_compare (&value1, &value2)); } static void @@ -939,15 +939,15 @@ compare_ip6_addresses (void) g_value_set_boxed (&value1, array1); g_value_set_boxed (&value2, array1); - g_print ("Comparing identical IPv6 address structures: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing identical IPv6 address structures: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_boxed (&value1, array1); g_value_set_boxed (&value2, array2); - g_print ("Comparing different IPv6 address structures: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different IPv6 address structures: %d\n", _gvalues_compare (&value1, &value2)); g_value_set_boxed (&value1, array1); g_value_set_boxed (&value2, array3); - g_print ("Comparing different IPv6 address structures: %d\n", nm_gvalues_compare (&value1, &value2)); + g_print ("Comparing different IPv6 address structures: %d\n", _gvalues_compare (&value1, &value2)); } int diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index bac7fda39a..449deb1cc8 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -534,7 +534,7 @@ _nm_utils_string_slist_validate (GSList *list, const char **valid_values) } static void -nm_utils_convert_strv_to_slist (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_strv_to_slist (const GValue *src_value, GValue *dest_value) { char **str; GSList *list = NULL; @@ -551,7 +551,7 @@ nm_utils_convert_strv_to_slist (const GValue *src_value, GValue *dest_value) } static void -nm_utils_convert_strv_to_ptrarray (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_strv_to_ptrarray (const GValue *src_value, GValue *dest_value) { char **str; GPtrArray *array = NULL; @@ -569,7 +569,7 @@ nm_utils_convert_strv_to_ptrarray (const GValue *src_value, GValue *dest_value) } static void -nm_utils_convert_strv_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_strv_to_string (const GValue *src_value, GValue *dest_value) { GSList *strings; GString *printable; @@ -595,7 +595,7 @@ nm_utils_convert_strv_to_string (const GValue *src_value, GValue *dest_value) } static void -nm_utils_convert_string_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_string_array_to_string (const GValue *src_value, GValue *dest_value) { GPtrArray *strings; GString *printable; @@ -621,7 +621,7 @@ nm_utils_convert_string_array_to_string (const GValue *src_value, GValue *dest_v } static void -nm_utils_convert_uint_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_uint_array_to_string (const GValue *src_value, GValue *dest_value) { GArray *array; GString *printable; @@ -653,7 +653,7 @@ nm_utils_convert_uint_array_to_string (const GValue *src_value, GValue *dest_val } static void -nm_utils_convert_ip4_addr_route_struct_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_ip4_addr_route_struct_array_to_string (const GValue *src_value, GValue *dest_value) { GPtrArray *ptr_array; GString *printable; @@ -738,7 +738,7 @@ convert_one_gvalue_hash_entry (gpointer key, gpointer value, gpointer user_data) } static void -nm_utils_convert_gvalue_hash_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_gvalue_hash_to_string (const GValue *src_value, GValue *dest_value) { GHashTable *hash; GString *printable; @@ -764,7 +764,7 @@ convert_one_string_hash_entry (gpointer key, gpointer value, gpointer user_data) } static void -nm_utils_convert_string_hash_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_string_hash_to_string (const GValue *src_value, GValue *dest_value) { GHashTable *hash; GString *printable; @@ -783,7 +783,7 @@ nm_utils_convert_string_hash_to_string (const GValue *src_value, GValue *dest_va } static void -nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_value) { GArray *array; GString *printable; @@ -811,7 +811,7 @@ nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_val } static gboolean -nm_utils_inet6_ntop (struct in6_addr *addr, char *buf) +_nm_utils_inet6_ntop (struct in6_addr *addr, char *buf) { if (!inet_ntop (AF_INET6, addr, buf, INET6_ADDRSTRLEN)) { int i; @@ -828,7 +828,7 @@ nm_utils_inet6_ntop (struct in6_addr *addr, char *buf) } static void -nm_utils_convert_ip6_dns_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_ip6_dns_array_to_string (const GValue *src_value, GValue *dest_value) { GPtrArray *ptr_array; GString *printable; @@ -854,7 +854,7 @@ nm_utils_convert_ip6_dns_array_to_string (const GValue *src_value, GValue *dest_ } addr = (struct in6_addr *) bytearray->data; memset (buf, 0, sizeof (buf)); - nm_utils_inet6_ntop (addr, buf); + _nm_utils_inet6_ntop (addr, buf); g_string_append_printf (printable, "%s", buf); } g_string_append_c (printable, ']'); @@ -864,7 +864,7 @@ nm_utils_convert_ip6_dns_array_to_string (const GValue *src_value, GValue *dest_ } static void -nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValue *dest_value) { GPtrArray *ptr_array; GString *printable; @@ -905,7 +905,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu } addr = (struct in6_addr *) ba_addr->data; memset (buf, 0, sizeof (buf)); - nm_utils_inet6_ntop (addr, buf); + _nm_utils_inet6_ntop (addr, buf); g_string_append_printf (printable, "ip = %s", buf); g_string_append (printable, ", "); @@ -928,7 +928,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu } addr = (struct in6_addr *) ba_addr->data; memset (buf, 0, sizeof (buf)); - nm_utils_inet6_ntop (addr, buf); + _nm_utils_inet6_ntop (addr, buf); g_string_append_printf (printable, "gw = %s", buf); g_string_append (printable, " }"); } @@ -939,7 +939,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu } static void -nm_utils_convert_ip6_route_struct_array_to_string (const GValue *src_value, GValue *dest_value) +_nm_utils_convert_ip6_route_struct_array_to_string (const GValue *src_value, GValue *dest_value) { GPtrArray *ptr_array; GString *printable; @@ -981,7 +981,7 @@ nm_utils_convert_ip6_route_struct_array_to_string (const GValue *src_value, GVal } addr = (struct in6_addr *) ba_addr->data; memset (buf, 0, sizeof (buf)); - nm_utils_inet6_ntop (addr, buf); + _nm_utils_inet6_ntop (addr, buf); g_string_append_printf (printable, "dst = %s", buf); g_string_append (printable, ", "); @@ -1004,7 +1004,7 @@ nm_utils_convert_ip6_route_struct_array_to_string (const GValue *src_value, GVal } addr = (struct in6_addr *) ba_addr->data; memset (buf, 0, sizeof (buf)); - nm_utils_inet6_ntop (addr, buf); + _nm_utils_inet6_ntop (addr, buf); g_string_append_printf (printable, "nh = %s", buf); g_string_append (printable, ", "); @@ -1025,7 +1025,7 @@ nm_utils_convert_ip6_route_struct_array_to_string (const GValue *src_value, GVal #define OLD_DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS (dbus_g_type_get_collection ("GPtrArray", OLD_DBUS_TYPE_G_IP6_ADDRESS)) static void -nm_utils_convert_old_ip6_addr_array (const GValue *src_value, GValue *dst_value) +_nm_utils_convert_old_ip6_addr_array (const GValue *src_value, GValue *dst_value) { GPtrArray *src_outer_array; GPtrArray *dst_outer_array; @@ -1081,43 +1081,43 @@ _nm_utils_register_value_transformations (void) if (G_UNLIKELY (!registered)) { g_value_register_transform_func (G_TYPE_STRV, DBUS_TYPE_G_LIST_OF_STRING, - nm_utils_convert_strv_to_slist); + _nm_utils_convert_strv_to_slist); g_value_register_transform_func (G_TYPE_STRV, DBUS_TYPE_G_ARRAY_OF_STRING, - nm_utils_convert_strv_to_ptrarray); + _nm_utils_convert_strv_to_ptrarray); g_value_register_transform_func (DBUS_TYPE_G_LIST_OF_STRING, G_TYPE_STRING, - nm_utils_convert_strv_to_string); + _nm_utils_convert_strv_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_STRING, G_TYPE_STRING, - nm_utils_convert_string_array_to_string); + _nm_utils_convert_string_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_UINT_ARRAY, G_TYPE_STRING, - nm_utils_convert_uint_array_to_string); + _nm_utils_convert_uint_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, G_TYPE_STRING, - nm_utils_convert_ip4_addr_route_struct_array_to_string); + _nm_utils_convert_ip4_addr_route_struct_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_STRING, - nm_utils_convert_gvalue_hash_to_string); + _nm_utils_convert_gvalue_hash_to_string); g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_STRING, G_TYPE_STRING, - nm_utils_convert_string_hash_to_string); + _nm_utils_convert_string_hash_to_string); g_value_register_transform_func (DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_STRING, - nm_utils_convert_byte_array_to_string); + _nm_utils_convert_byte_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, G_TYPE_STRING, - nm_utils_convert_ip6_dns_array_to_string); + _nm_utils_convert_ip6_dns_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, G_TYPE_STRING, - nm_utils_convert_ip6_addr_struct_array_to_string); + _nm_utils_convert_ip6_addr_struct_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, G_TYPE_STRING, - nm_utils_convert_ip6_route_struct_array_to_string); + _nm_utils_convert_ip6_route_struct_array_to_string); g_value_register_transform_func (OLD_DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, - nm_utils_convert_old_ip6_addr_array); + _nm_utils_convert_old_ip6_addr_array); registered = TRUE; } } diff --git a/tools/check-exports.sh b/tools/check-exports.sh index 1415e14480..3c75ef024f 100755 --- a/tools/check-exports.sh +++ b/tools/check-exports.sh @@ -8,7 +8,7 @@ so=$1 def=$2 # Have to prefix with a tab and suffix with a ';' to match .ver file format -get_syms='( objdump -t "$so" | grep "^[^ ]* [^l.*]*[.]"; objdump -t "$so" | grep "[.]hidden.*"; ) | sed "s/.* //" | sed "s/^/\t/" | sed "s/$/;/"' +get_syms='( objdump -t "$so" | grep "^[^ ]* [^l.*]*[.]"; objdump -t "$so" | grep "^[^ ]* l[^.*]*\.text[^_]*nm_" | grep -v "_init"; ) | sed "s/.* //" | sed "s/^/\t/" | sed "s/$/;/"' echo $so: checking exported symbols against $def