From 5e857426de0541579db9b77a7f85199ab76b2deb Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 30 Sep 2003 19:36:20 +0000 Subject: [PATCH] 2003-09-30 Marcus Brinkmann * gpgme.h (gpg_strerror_r): Change prototype to match gpg_strerror_r change. * error.c (gpg_strerror_r): Likewise, also update implementation. --- trunk/gpgme/ChangeLog | 4 ++++ trunk/gpgme/error.c | 17 ++++++++++------- trunk/gpgme/gpgme.h | 13 ++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 70f9ec8..93e2e3c 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,5 +1,9 @@ 2003-09-30 Marcus Brinkmann + * gpgme.h (gpg_strerror_r): Change prototype to match + gpg_strerror_r change. + * error.c (gpg_strerror_r): Likewise, also update implementation. + * gpgme.c (gpgme_hash_algo_name): Change name of RMD160 to RIPEMD160, name of TIGER to TIGER192, name of CRC32-RFC1510 to CRC32RFC1510, and name of CRC24-RFC2440 to CRC24RFC2440. diff --git a/trunk/gpgme/error.c b/trunk/gpgme/error.c index aac2c28..b17bb09 100644 --- a/trunk/gpgme/error.c +++ b/trunk/gpgme/error.c @@ -32,14 +32,17 @@ gpgme_strerror (gpgme_error_t err) } -/* Return a pointer to a string containing a description of the error - code in the error value ERR. The buffer for the string is - allocated with malloc(), and has to be released by the user. On - error, NULL is returned. */ -char * -gpgme_strerror_r (gpgme_error_t err) +/* Return the error string for ERR in the user-supplied buffer BUF of + size BUFLEN. This function is, in contrast to gpg_strerror, + thread-safe if a thread-safe strerror_r() function is provided by + the system. If the function succeeds, 0 is returned and BUF + contains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF contains as much of the + beginning of the error string as fits into the buffer. */ +int +gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen) { - return gpg_strerror_r (err); + return gpg_strerror_r (err, buf, buflen); } diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h index df9a8e7..921d57e 100644 --- a/trunk/gpgme/gpgme.h +++ b/trunk/gpgme/gpgme.h @@ -131,11 +131,14 @@ gpgme_err_source (gpgme_error_t err) code in the error value ERR. This function is not thread safe. */ const char *gpgme_strerror (gpgme_error_t err); -/* Return a pointer to a string containing a description of the error - code in the error value ERR. The buffer for the string is - allocated with malloc(), and has to be released by the user. On - error, NULL is returned. */ -char *gpgme_strerror_r (gpgme_error_t err); +/* Return the error string for ERR in the user-supplied buffer BUF of + size BUFLEN. This function is, in contrast to gpg_strerror, + thread-safe if a thread-safe strerror_r() function is provided by + the system. If the function succeeds, 0 is returned and BUF + contains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF contains as much of the + beginning of the error string as fits into the buffer. */ +int gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen); /* Return a pointer to a string containing a description of the error -- 2.26.2