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

core: Un-deprecate gpgme_data_rewind.

Browse Source 
* src/gpgme.h.in (gpgme_data_rewind): Un-deprecate.
* src/data-compat.c (gpgme_data_rewind): Move to ...
* src/data.c (gpgme_data_rewind): here.
--

That function is very convenient because it is required a lot with
memory streams.  It also documents the intention of the caller better
than gpgme_data_seek with its addition parameters and the need to map
system errors.  Thus it does not make sense to make it a first class
citizen again.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-02-02 09:50:47 +01:00
parent 9b7d81998b
commit d19bea52af
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -12,6 +12,7 @@ Noteworthy changes in version 1.8.1 (unreleased)
cpp: Key::UserID::revoke() NEW. cpp: Key::UserID::revoke() NEW.
cpp: Key::addUid() NEW. cpp: Key::addUid() NEW.
qt: CryptoConfig::stringValueList() NEW. qt: CryptoConfig::stringValueList() NEW.
gpgme_data_rewind UN-DEPRECATE.
Noteworthy changes in version 1.8.0 (2016-11-16) Noteworthy changes in version 1.8.0 (2016-11-16)

13
src/data-compat.c
View File

@ -239,16 +239,3 @@ gpgme_data_new_with_read_cb (gpgme_data_t *r_dh,
(*r_dh)->data.old_user.handle = read_cb_value; (*r_dh)->data.old_user.handle = read_cb_value;
return TRACE_ERR (0); return TRACE_ERR (0);
} }
gpgme_error_t
gpgme_data_rewind (gpgme_data_t dh)
{
gpgme_error_t err;
TRACE_BEG (DEBUG_DATA, "gpgme_data_rewind", dh);
err = ((gpgme_data_seek (dh, 0, SEEK_SET) == -1)
? gpg_error_from_syserror () : 0);
return TRACE_ERR (err);
}

14
src/data.c
View File

@ -158,6 +158,20 @@ gpgme_data_seek (gpgme_data_t dh, gpgme_off_t offset, int whence)
} }
/* Convenience function to do a gpgme_data_seek (dh, 0, SEEK_SET). */
gpgme_error_t
gpgme_data_rewind (gpgme_data_t dh)
{
gpgme_error_t err;
TRACE_BEG (DEBUG_DATA, "gpgme_data_rewind", dh);
err = ((gpgme_data_seek (dh, 0, SEEK_SET) == -1)
? gpg_error_from_syserror () : 0);
return TRACE_ERR (err);
}
/* Release the data object with the handle DH. */ /* Release the data object with the handle DH. */
void void
gpgme_data_release (gpgme_data_t dh) gpgme_data_release (gpgme_data_t dh)

5
src/gpgme.h.in
View File

@ -1165,9 +1165,8 @@ gpgme_error_t gpgme_data_new_from_filepart (gpgme_data_t *r_dh,
const char *fname, FILE *fp, const char *fname, FILE *fp,
@API__OFF_T@ offset, size_t length); @API__OFF_T@ offset, size_t length);
/* Reset the read pointer in DH. Deprecated, please use /* Convenience function to do a gpgme_data_seek (dh, 0, SEEK_SET). */
gpgme_data_seek instead. */ gpgme_error_t gpgme_data_rewind (gpgme_data_t dh);
gpgme_error_t gpgme_data_rewind (gpgme_data_t dh) _GPGME_DEPRECATED(0,4);