diff --git a/NEWS b/NEWS index 190692f7..2cbd9819 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,10 @@ + * There is a Texinfo manual documenting the API. + * The LENGTH argument to gpgme_data_new_from_filepart changed its type from off_t to the unsigned size_t. - * There is a Texinfo manual documenting the API. + * The R_HD argument to the GpgmePassphraseCb type changed its type + from void* to void**. * New interface gpgme_op_trustlist_end() to match gpgme_op_keylist_end. @@ -9,6 +12,7 @@ * Interface changes relative to the 0.3.0 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_data_new_from_filepart CHANGED: Type of LENGTH is size_t. +GpgmePassphraseCb CHANGED: Type of R_HD is void **. gpgme_op_trustlist_next NEW ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/TODO b/TODO index 27055a9e..c924eb02 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,7 @@ * ABI's to break: ** GpgmePassphraseCb should have void **R_HD, not void *R_HD. -** trustlist has the same start/end problem as keylist had. - In fact, all the _start functions have this problem! - In addition, the resulting error of the operation can not be - retrieved seperately; the op_foobar operations can't be implemented +** The resulting error of an operation can not be retrieved + seperately; the op_foobar operations can't be implemented by the user, they are not merely convenience, but necessity, while the op_foobar_start functions for these are unusable (or render the context unusable, your choice). diff --git a/doc/ChangeLog b/doc/ChangeLog index 2979e0ab..dd4efe52 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2002-01-22 Marcus Brinkmann + + * gpgme.texi (Passphrase callback): Change GpgmePassphraseCb's + R_HD type from void* to void**. + 2002-01-22 Marcus Brinkmann * gpgme.texi (Creating data buffers): Change diff --git a/doc/gpgme.texi b/doc/gpgme.texi index ddd9432e..094646ba 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -1007,7 +1007,7 @@ Fast listing without information about the key validity. @node Passphrase callback @subsection Passphrase callback -@deftp {Data type} {const char *(*GpgmePassphraseCb)(void *@var{hook}, const char *@var{desc}, void *@var{r_hd})} +@deftp {Data type} {const char *(*GpgmePassphraseCb)(void *@var{hook}, const char *@var{desc}, void **@var{r_hd})} The @code{GpgmePasshraseCb} type is the type of functions usable as passphrase callback function. diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 059fcaac..2e3f4f10 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2002-01-22 Marcus Brinkmann + + * gpgme.h (GpgmePassphraseCb): Change type of R_HD from void* to + void**. + 2002-01-22 Marcus Brinkmann * data.c (gpgme_data_new_from_filepart): Change type of LENGTH diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c index 7e4bee39..fe848327 100644 --- a/gpgme/gpgme.c +++ b/gpgme/gpgme.c @@ -303,7 +303,7 @@ gpgme_set_keylist_mode (GpgmeCtx ctx, int mode) * * typedef const char *(*GpgmePassphraseCb)(void*cb_value, * const char *desc, - * void *r_hd); + * void **r_hd); * * and called whenever gpgme needs a passphrase. DESC will have a nice * text, to be used to prompt for the passphrase and R_HD is just a parameter diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h index 33ae45d0..9fcd406b 100644 --- a/gpgme/gpgme.h +++ b/gpgme/gpgme.h @@ -160,7 +160,7 @@ typedef enum { } GpgmeProtocol; typedef const char *(*GpgmePassphraseCb)(void*, - const char *desc, void *r_hd); + const char *desc, void **r_hd); typedef void (*GpgmeProgressCb)(void *opaque, const char *what, int type, int current, int total ); diff --git a/tests/ChangeLog b/tests/ChangeLog index 78928213..3fec7f7a 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,10 @@ +2002-01-22 Marcus Brinkmann + + * gpg/t-signers.c (passphrase_cb): Change type of r_hd to void**. + * gpg/t-sign.c (passphrase_cb): Likewise. + * gpg/t-decrypt-verify.c (passphrase_cb): Likewise. + * gpg/t-decrypt.c (passphrase_cb): Likewise. + 2001-12-19 Marcus Brinkmann * gpg/t-decrypt-verify.c: Don't include `mcheck.h'. Reported by diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c index 14a28a77..bf407eec 100644 --- a/tests/gpg/t-decrypt-verify.c +++ b/tests/gpg/t-decrypt-verify.c @@ -58,7 +58,7 @@ print_data (GpgmeData dh) } static const char * -passphrase_cb (void *opaque, const char *desc, void *r_hd) +passphrase_cb (void *opaque, const char *desc, void **r_hd) { const char *pass; diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c index 095cb82c..e6bc099d 100644 --- a/tests/gpg/t-decrypt.c +++ b/tests/gpg/t-decrypt.c @@ -59,7 +59,7 @@ print_data ( GpgmeData dh ) static const char * -passphrase_cb ( void *opaque, const char *desc, void *r_hd ) +passphrase_cb ( void *opaque, const char *desc, void **r_hd ) { const char *pass; diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index ca9dc341..28c34dca 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -62,7 +62,7 @@ print_data ( GpgmeData dh ) } static const char * -passphrase_cb ( void *opaque, const char *desc, void *r_hd ) +passphrase_cb ( void *opaque, const char *desc, void **r_hd ) { const char *pass; diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c index c05ef182..f3fa6f5c 100644 --- a/tests/gpg/t-signers.c +++ b/tests/gpg/t-signers.c @@ -62,7 +62,7 @@ print_data (GpgmeData dh) } static const char * -passphrase_cb (void *opaque, const char *desc, void *r_hd) +passphrase_cb (void *opaque, const char *desc, void **r_hd) { const char *pass;