From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 15 Sep 2017 12:45:20 +0000 (+0200)
Subject: str: rename _gnutls_buffer_pop_datum_prefix to _gnutls_buffer_pop_datum_prefix32
X-Git-Tag: gnutls_3_6_3~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfeb22adbbbfb6dafcfcaf2185a7c44d38a97f7e;p=thirdparty%2Fgnutls.git

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 17e4fe3b86..404d466ab0 100644
--- 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 48dd15e314..c7ba54af47 100644
--- 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) { \