str: rename _gnutls_buffer_pop_datum_prefix to _gnutls_buffer_pop_datum_prefix32

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/str.c b/lib/str.c
index 17e4fe3b86eb768cb05e591f05613fc25b83255d..404d466ab05165acc122b941f9fa4468122251b0 100644 (file)
--- a/lib/str.c
+++ b/lib/str.c
@@ -800,8 +800,8 @@ _gnutls_buffer_pop_prefix(gnutls_buffer_st * buf, size_t * data_size,
 }
 
 int
-_gnutls_buffer_pop_datum_prefix(gnutls_buffer_st * buf,
-                               gnutls_datum_t * data)
+_gnutls_buffer_pop_datum_prefix32(gnutls_buffer_st * buf,
+                                 gnutls_datum_t * data)
 {
        size_t size;
        int ret;

diff --git a/lib/str.h b/lib/str.h
index 48dd15e314f8c02e72ba09f8a1850d8e34f69481..c7ba54af472e5e8d21f3b7a2d491559c1377b359 100644 (file)
--- a/lib/str.h
+++ b/lib/str.h
@@ -124,8 +124,8 @@ int _gnutls_buffer_pop_prefix(gnutls_buffer_st * buf, size_t * data_size,
                              int check);
 
 /* 32-bit prefix */
-int _gnutls_buffer_pop_datum_prefix(gnutls_buffer_st * buf,
-                                   gnutls_datum_t * data);
+int _gnutls_buffer_pop_datum_prefix32(gnutls_buffer_st * buf,
+                                     gnutls_datum_t * data);
 
 /* 16-bit prefix */
 int _gnutls_buffer_pop_datum_prefix16(gnutls_buffer_st * buf,
@@ -234,7 +234,7 @@ int _gnutls_hostname_compare(const char *certname, size_t certnamesize,
 
 #define BUFFER_POP_DATUM(b, o) { \
        gnutls_datum_t d; \
-       ret = _gnutls_buffer_pop_datum_prefix(b, &d); \
+       ret = _gnutls_buffer_pop_datum_prefix32(b, &d); \
        if (ret >= 0) \
            ret = _gnutls_set_datum (o, d.data, d.size); \
        if (ret < 0) { \