From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 17 May 2014 06:44:02 +0000 (+0200)
Subject: do not yet export gnutls_memset().
X-Git-Tag: gnutls_3_3_3~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa2ea1faef73998a6e7a109372d68685a65e8538;p=thirdparty%2Fgnutls.git

do not yet export gnutls_memset().
---

diff --git a/NEWS b/NEWS
index eee73b1368..071a3345ad 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ create a full chain. This addresses points from https://savannah.gnu.org/support
 has been disabled.
 
 ** API and ABI modifications:
-gnutls_memset: Added
+No changes since last version.
 
 
 * Version 3.3.2 (released 2014-05-06)
diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index 418a7b724f..1fcf28b218 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -30,6 +30,7 @@ void *gnutls_realloc_fast(void *ptr, size_t size);
 
 void *_gnutls_calloc(size_t nmemb, size_t size);
 char *_gnutls_strdup(const char *);
+void gnutls_memset(void *data, int c, size_t size);
 
 #define zrelease_mpi_key(mpi) if (*mpi!=NULL) { \
                 _gnutls_mpi_clear(*mpi); \
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 49f4bd2f9c..48c6d4783e 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1470,7 +1470,6 @@ extern gnutls_alloc_function gnutls_malloc;
 extern gnutls_realloc_function gnutls_realloc;
 extern gnutls_calloc_function gnutls_calloc;
 extern gnutls_free_function gnutls_free;
-void gnutls_memset(void *data, int c, size_t size);
 
 extern char *(*gnutls_strdup) (const char *);
 
diff --git a/lib/safe-memset.c b/lib/safe-memset.c
index 69a5ea2d12..5b53a6ede8 100644
--- a/lib/safe-memset.c
+++ b/lib/safe-memset.c
@@ -24,7 +24,7 @@
 # include <gnutls_int.h>
 #endif
 
-/**
+/*-
  * gnutls_memset:
  * @data: the memory to set
  * @c: the constant byte to fill the memory with
@@ -36,7 +36,7 @@
  * Returns: void.
  *
  * Since: 3.3.3
- **/
+ -*/
 void gnutls_memset(void *data, int c, size_t size)
 {
 	volatile unsigned volatile_zero = 0;