GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Fix error types.

Browse Source 
* NEWS: Update.
* src/data.c (gpgme_data_set_flag): Return a 'gpgme_error_t'.
* src/error.c (gpgme_strerror_r): Fix type of first argument.
* src/gpgme.h.in (gpgme_strerror_r): Adapt.
(gpgme_data_set_flag): Likewise.
--
Fix for consistency.  This should not pose problems, because typedef
gpg_error_t gpgme_error_t.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-02-15 09:45:46 +01:00
parent 92adc9bbf6
commit 6df6e01ed5
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -5,6 +5,8 @@ Noteworthy changes in version 1.8.1 (unreleased)
* Interface changes relative to the 1.8.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gpgme_strerror_r CHANGED: Use gpgme_error_t (compatible type).
gpgme_data_set_flag CHANGED: Return gpgme_error_t (compatible type).
cpp: Context::revUid(const Key&, const char*) NEW.
cpp: Context::startRevUid(const Key&, const char*) NEW.
cpp: Context::addUid(const Key&, const char*) NEW.

2
src/data.c
View File

@ -259,7 +259,7 @@ gpgme_data_get_file_name (gpgme_data_t dh)
/* Set a flag for the data object DH. See the manual for details. */
gpg_error_t
gpgme_error_t
gpgme_data_set_flag (gpgme_data_t dh, const char *name, const char *value)
{
TRACE_BEG2 (DEBUG_DATA, "gpgme_data_set_flag", dh,

2
src/error.c
View File

@ -41,7 +41,7 @@ gpgme_strerror (gpgme_error_t err)
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)
gpgme_strerror_r (gpgme_error_t err, char *buf, size_t buflen)
{
return gpg_strerror_r (err, buf, buflen);
}

6
src/gpgme.h.in
View File

@ -177,7 +177,7 @@ const char *gpgme_strerror (gpgme_error_t err);
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);
int gpgme_strerror_r (gpgme_error_t err, char *buf, size_t buflen);
/* Return a pointer to a string containing a description of the error
source in the error value ERR. */
@ -1161,8 +1161,8 @@ gpgme_error_t gpgme_data_set_file_name (gpgme_data_t dh,
const char *file_name);
/* Set a flag for the data object DH. See the manual for details. */
gpg_error_t gpgme_data_set_flag (gpgme_data_t dh,
const char *name, const char *value);
gpgme_error_t gpgme_data_set_flag (gpgme_data_t dh,
const char *name, const char *value);
/* Try to identify the type of the data in DH. */
gpgme_data_type_t gpgme_data_identify (gpgme_data_t dh, int reserved);