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

doc/

Browse Source 
2002-04-23  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.texi (Passphrase Callback): Document that either return
	argument can be NULL.
	(Progress Meter Callback): Likewise.

gpgme/
2002-04-23  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.c (gpgme_get_progress_cb): Allow either return parameter
	to be NULL.
	(gpgme_get_passphrase_cb): Likewise.
This commit is contained in:
Marcus Brinkmann 2002-04-22 22:06:09 +00:00
parent 025866092e
commit 09635ef2e6
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-23 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi (Passphrase Callback): Document that either return
argument can be NULL.
(Progress Meter Callback): Likewise.
2002-04-22 Marcus Brinkmann <marcus@g10code.de> 2002-04-22 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi (Passphrase Callback): Fix small typo. Document the * gpgme.texi (Passphrase Callback): Fix small typo. Document the

6
doc/gpgme.texi
View File

@ -1188,6 +1188,9 @@ is used when a passphrase needs to be provided by the user in
@var{*passfunc}, and the first argument for this function in @var{*passfunc}, and the first argument for this function in
@var{*hook_value}. If no passphrase callback is set, or @var{ctx} is @var{*hook_value}. If no passphrase callback is set, or @var{ctx} is
not a valid pointer, @code{NULL} is returned in both variables. not a valid pointer, @code{NULL} is returned in both variables.
@var{passfunc} or @var{hook_value} can be @code{NULL}. In this case,
the corresponding value will not be returned.
@end deftypefun @end deftypefun
@ -1229,6 +1232,9 @@ used to inform the user about the progress made in @var{*progfunc},
and the first argument for this function in @var{*hook_value}. If no and the first argument for this function in @var{*hook_value}. If no
progress callback is set, or @var{ctx} is not a valid pointer, progress callback is set, or @var{ctx} is not a valid pointer,
@code{NULL} is returned in both variables. @code{NULL} is returned in both variables.
@var{progfunc} or @var{hook_value} can be @code{NULL}. In this case,
the corresponding value will not be returned.
@end deftypefun @end deftypefun

6
gpgme/ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-23 Marcus Brinkmann <marcus@g10code.de>
* gpgme.c (gpgme_get_progress_cb): Allow either return parameter
to be NULL.
(gpgme_get_passphrase_cb): Likewise.
2002-04-22 Marcus Brinkmann <marcus@g10code.de> 2002-04-22 Marcus Brinkmann <marcus@g10code.de>
* gpgme.c (gpgme_get_passphrase_cb): New function. * gpgme.c (gpgme_get_passphrase_cb): New function.

36
gpgme/gpgme.c
View File

@ -401,24 +401,28 @@ gpgme_set_passphrase_cb (GpgmeCtx ctx, GpgmePassphraseCb cb, void *cb_value)
/** /**
* gpgme_get_passphrase_cb: * gpgme_get_passphrase_cb:
* @ctx: the context * @ctx: the context
* @cb: The current callback function * @r_cb: The current callback function
* @cb_value: The current value passed to the callback function * @r_cb_value: The current value passed to the callback function
* *
* This function returns the callback function to be used to pass a passphrase * This function returns the callback function to be used to pass a passphrase
* to the crypto engine. * to the crypto engine.
**/ **/
void void
gpgme_get_passphrase_cb (GpgmeCtx ctx, GpgmePassphraseCb *cb, void **cb_value) gpgme_get_passphrase_cb (GpgmeCtx ctx, GpgmePassphraseCb *r_cb, void **r_cb_value)
{ {
if (ctx) if (ctx)
{ {
*cb = ctx->passphrase_cb; if (r_cb)
*cb_value = ctx->passphrase_cb_value; *r_cb = ctx->passphrase_cb;
if (r_cb_value)
*r_cb_value = ctx->passphrase_cb_value;
} }
else else
{ {
*cb = NULL; if (r_cb)
*cb_value = NULL; *r_cb = NULL;
if (r_cb_value)
*r_cb_value = NULL;
} }
} }
@ -454,22 +458,26 @@ gpgme_set_progress_cb (GpgmeCtx ctx, GpgmeProgressCb cb, void *cb_value)
/** /**
* gpgme_get_progress_cb: * gpgme_get_progress_cb:
* @ctx: the context * @ctx: the context
* @cb: The current callback function * @r_cb: The current callback function
* @cb_value: The current value passed to the callback function * @r_cb_value: The current value passed to the callback function
* *
* This function returns the callback function to be used as a progress indicator. * This function returns the callback function to be used as a progress indicator.
**/ **/
void void
gpgme_get_progress_cb (GpgmeCtx ctx, GpgmeProgressCb *cb, void **cb_value) gpgme_get_progress_cb (GpgmeCtx ctx, GpgmeProgressCb *r_cb, void **r_cb_value)
{ {
if (ctx) if (ctx)
{ {
*cb = ctx->progress_cb; if (r_cb)
*cb_value = ctx->progress_cb_value; *r_cb = ctx->progress_cb;
if (r_cb_value)
*r_cb_value = ctx->progress_cb_value;
} }
else else
{ {
*cb = NULL; if (r_cb)
*cb_value = NULL; *r_cb = NULL;
if (r_cb_value)
*r_cb_value = NULL;
} }
} }