gnutls_idna_map was prefixed with underscore to avoid clashes with exported symbols

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 25de038dbd753ee370ba420d01a6b8ebdf70af85..a15c1a3ca940145c7500edf0122562ba1540b798 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1198,5 +1198,5 @@ GNUTLS_PRIVATE_3_4 {
        # Internal symbols needed by tests/name-constraints-merge:
        _gnutls_x509_name_constraints_merge;
        _gnutls_server_name_set_raw;
-       gnutls_idna_map;
+       _gnutls_idna_map;
 };

diff --git a/lib/str-unicode.c b/lib/str-unicode.c
index f8d6880e634076b51291c5365032d18b912259ff..4be4b6e2a678da58a5c2829ac5c88bbce0921676 100644 (file)
--- a/lib/str-unicode.c
+++ b/lib/str-unicode.c
@@ -147,7 +147,7 @@ int gnutls_utf8_password_normalize(const unsigned char *password, unsigned passw
 
 #ifdef HAVE_LIBIDN
 /*-
- * gnutls_idna_map:
+ * _gnutls_idna_map:
  * @input: contain the UTF-8 formatted domain name
  * @ilen: the length of the provided string
  * @out: the result in an null-terminated allocated string
@@ -163,7 +163,7 @@ int gnutls_utf8_password_normalize(const unsigned char *password, unsigned passw
  *
  * Since: 3.5.7
  -*/
-int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
+int _gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
 {
        char *idna = NULL;
        int rc, ret;
@@ -207,7 +207,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
 #else
 
 # undef gnutls_idna_map
-int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
+int _gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
 {
        return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
 }

diff --git a/lib/str.h b/lib/str.h
index ae50a773876ca4e05b368cfdfc434d3d5b799576..0029a88a4172362ea0e4a234b074ca8db553cec9 100644 (file)
--- a/lib/str.h
+++ b/lib/str.h
@@ -46,7 +46,7 @@ int gnutls_utf8_password_normalize(const uint8_t *password, unsigned password_le
 
 #ifndef HAVE_LIBIDN
 inline static
-int _gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
+int __gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
 {
        out->data = gnutls_malloc(ilen+1);
        if (out->data == NULL)
@@ -56,9 +56,10 @@ int _gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsi
        out->data[ilen] = 0;
        return 0;
 }
-# define gnutls_idna_map _gnutls_idna_map
+# define gnutls_idna_map __gnutls_idna_map
 #else
-int gnutls_idna_map(const char * input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
+# define gnutls_idna_map _gnutls_idna_map
+int _gnutls_idna_map(const char * input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
 #endif
 
 void _gnutls_str_cpy(char *dest, size_t dest_tot_size, const char *src);

diff --git a/tests/str-idna.c b/tests/str-idna.c
index 1931647399435dfe477b8e621ee2f63bc54803d0..af32bfce8b164bcfd7c83cce7a2750e2b7bebd43 100644 (file)
--- a/tests/str-idna.c
+++ b/tests/str-idna.c
@@ -31,13 +31,13 @@
 #include <gnutls/gnutls.h>
 #include <cmocka.h>
 
-int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
+int _gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
 
 #define MATCH_FUNC(fname, str, normalized) \
 static void fname(void **glob_state) \
 { \
        gnutls_datum_t out; \
-       int ret = gnutls_idna_map(str, strlen(str), &out, 0); \
+       int ret = _gnutls_idna_map(str, strlen(str), &out, 0); \
        if (normalized == NULL) { /* expect failure */ \
                assert_int_not_equal(ret, 0); \
                return; \
@@ -86,7 +86,7 @@ int main(void)
                cmocka_unit_test(test_dots)
        };
 
-       ret = gnutls_idna_map("x", 1, &tmp, 0);
+       ret = _gnutls_idna_map("x", 1, &tmp, 0);
        if (ret == GNUTLS_E_UNIMPLEMENTED_FEATURE)
                exit(77);
        gnutls_free(tmp.data);