From 15737adc7a03ce59263953b3c2c7e550367eb836 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 15 Sep 2017 14:46:13 +0200 Subject: str: rename _gnutls_buffer_pop_prefix to _gnutls_buffer_pop_prefix32 Signed-off-by: Nikos Mavrogiannopoulos --- lib/str.c | 6 +++--- lib/str.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/str.c b/lib/str.c index f9a3221803..6cdfd0d6ff 100644 --- a/lib/str.c +++ b/lib/str.c @@ -775,8 +775,8 @@ _gnutls_buffer_append_prefix(gnutls_buffer_st * buf, int pfx_size, * the number read, is less than the data in the buffer */ int -_gnutls_buffer_pop_prefix(gnutls_buffer_st * buf, size_t * data_size, - int check) +_gnutls_buffer_pop_prefix32(gnutls_buffer_st * buf, size_t * data_size, + int check) { size_t size; @@ -806,7 +806,7 @@ _gnutls_buffer_pop_datum_prefix32(gnutls_buffer_st * buf, size_t size; int ret; - ret = _gnutls_buffer_pop_prefix(buf, &size, 1); + ret = _gnutls_buffer_pop_prefix32(buf, &size, 1); if (ret < 0) { gnutls_assert(); return ret; diff --git a/lib/str.h b/lib/str.h index c7ba54af47..f33dfb9b66 100644 --- a/lib/str.h +++ b/lib/str.h @@ -120,8 +120,8 @@ void _gnutls_buffer_pop_datum(gnutls_buffer_st *, gnutls_datum_t *, size_t max_size); /* 32-bit prefix */ -int _gnutls_buffer_pop_prefix(gnutls_buffer_st * buf, size_t * data_size, - int check); +int _gnutls_buffer_pop_prefix32(gnutls_buffer_st * buf, size_t * data_size, + int check); /* 32-bit prefix */ int _gnutls_buffer_pop_datum_prefix32(gnutls_buffer_st * buf, @@ -245,7 +245,7 @@ int _gnutls_hostname_compare(const char *certname, size_t certnamesize, #define BUFFER_POP_NUM(b, o) { \ size_t s; \ - ret = _gnutls_buffer_pop_prefix(b, &s, 0); \ + ret = _gnutls_buffer_pop_prefix32(b, &s, 0); \ if (ret < 0) { \ gnutls_assert(); \ goto error; \ @@ -255,7 +255,7 @@ int _gnutls_hostname_compare(const char *certname, size_t certnamesize, #define BUFFER_POP_CAST_NUM(b, o) { \ size_t s; \ - ret = _gnutls_buffer_pop_prefix(b, &s, 0); \ + ret = _gnutls_buffer_pop_prefix32(b, &s, 0); \ if (ret < 0) { \ gnutls_assert(); \ goto error; \ -- cgit v1.2.1