summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-02-22 21:19:31 +0000
committerWerner Koch <wk@gnupg.org>2009-02-22 21:19:31 +0000
commit877eaed65863827fba91ffc8d67d872aea14cc54 (patch)
tree97b7f95b17203e5105929d18817628ae7ea0575c
parent9ecd705ab395d6fa9c192471fe81dc160dfeafac (diff)
downloadlibgcrypt-877eaed65863827fba91ffc8d67d872aea14cc54.tar.gz
Doc fixes
-rw-r--r--THANKS1
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gcrypt.texi12
3 files changed, 12 insertions, 6 deletions
diff --git a/THANKS b/THANKS
index cf99a6d0..84626089 100644
--- a/THANKS
+++ b/THANKS
@@ -118,6 +118,7 @@ Roddy Strachan roddy@satlink.com.au
Roland Rosenfeld roland@spinnaker.rhein.de
Ross Golder rossigee@bigfoot.com
Serge Munhoven munhoven@mema.ucl.ac.be
+Sergi Blanch i Torné sergi at calcurco cat
Simon Josefsson jas@extundo.com
SL Baur steve@xemacs.org
Stephan Austermuehle au@hcsd.de
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 027a1476..835df381 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-22 Werner Koch <wk@g10code.com>
+
+ * gcrypt.texi (Memory allocation): Fix describion of gcry-calloc.
+ Reported by Sergi Blanch i Torné.
+
2008-12-10 Werner Koch <wk@g10code.com>
* gcrypt.texi (Cryptographic Functions): Explain the domain
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 07e372c0..0bfc44b1 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -4643,15 +4643,15 @@ it returns NULL.
Like @code{gcry_malloc}, but uses secure memory.
@end deftypefun
-@deftypefun {void *} gcry_calloc (size_t @var{n})
+@deftypefun {void *} gcry_calloc (size_t @var{n}, size_t @var{m})
-This function tries to allocate @var{n} bytes of cleared memory
-(i.e. memory that is initialized with zero bytes). On success it
-returns a pointer to the memory area, in an out-of-core condition, it
-returns NULL.
+This function allocates a cleared block of memory (i.e. initialized with
+zero bytes) long enough to contain a vector of @var{n} elements, each of
+size @var{m} bytes. On success it returns a pointer to the memory
+block; in an out-of-core condition, it returns NULL.
@end deftypefun
-@deftypefun {void *} gcry_calloc_secure (size_t @var{n})
+@deftypefun {void *} gcry_calloc_secure (size_t @var{n}, size_t @var{m})
Like @code{gcry_calloc}, but uses secure memory.
@end deftypefun