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

Revert "core: Fix error types."

Browse Source 
--
This reverts commit 6df6e01ed5.

gpgme_error_t et al are from a time where we had no hard dependency on
libgpg-error.  Now libgpg-error is a required and thus it does not
make sense to have these surrogates.  In fact we should ventually
completely remove them.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-03-02 14:47:51 +01:00
parent 8071a6b2ca
commit 2486d0073b
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -7,8 +7,6 @@ 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).
gpgme_op_createkey CHANGED: Meaning of 'expire' parameter.
gpgme_op_createsubkey CHANGED: Meaning of 'expire' parameter.
GPGME_CREATE_NOEXPIRE 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. */
gpgme_error_t
gpg_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 (gpgme_error_t err, char *buf, size_t buflen)
gpgme_strerror_r (gpg_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 (gpgme_error_t err, char *buf, size_t buflen);
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
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. */
gpgme_error_t gpgme_data_set_flag (gpgme_data_t dh,
const char *name, const char *value);
gpg_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);