2003-07-29 Marcus Brinkmann <marcus@g10code.de>
* decrypt-verify.c (decrypt_verify_status_handler): Expand silly and wrong expression. * encrypt-sign.c (encrypt_sign_status_handler): Likewise. * encrypt.c (encrypt_sym_status_handler): Likewise. * sign.c (sign_status_handler): Likewise. * verify.c (verify_status_handler): Likewise. * decrypt.c (decrypt_status_handler): Likewise.
This commit is contained in:
parent
235e4e8eac
commit
95390e074a
@ -1,5 +1,13 @@
|
|||||||
2003-07-29 Marcus Brinkmann <marcus@g10code.de>
|
2003-07-29 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* decrypt-verify.c (decrypt_verify_status_handler): Expand silly
|
||||||
|
and wrong expression.
|
||||||
|
* encrypt-sign.c (encrypt_sign_status_handler): Likewise.
|
||||||
|
* encrypt.c (encrypt_sym_status_handler): Likewise.
|
||||||
|
* sign.c (sign_status_handler): Likewise.
|
||||||
|
* verify.c (verify_status_handler): Likewise.
|
||||||
|
* decrypt.c (decrypt_status_handler): Likewise.
|
||||||
|
|
||||||
* engine.c (gpgme_get_engine_info): Initialize NULL.
|
* engine.c (gpgme_get_engine_info): Initialize NULL.
|
||||||
|
|
||||||
2003-07-23 Marcus Brinkmann <marcus@g10code.de>
|
2003-07-23 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
@ -30,9 +30,14 @@ static gpgme_error_t
|
|||||||
decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
|
decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
|
||||||
char *args)
|
char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_decrypt_status_handler (priv, code, args)
|
|
||||||
|| _gpgme_verify_status_handler (priv, code, args);
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_decrypt_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_verify_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,8 +147,12 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
|
|||||||
static gpgme_error_t
|
static gpgme_error_t
|
||||||
decrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
decrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_decrypt_status_handler (priv, code, args);
|
|
||||||
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_decrypt_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,9 +30,14 @@
|
|||||||
static gpgme_error_t
|
static gpgme_error_t
|
||||||
encrypt_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
encrypt_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_encrypt_status_handler (priv, code, args)
|
|
||||||
|| _gpgme_sign_status_handler (priv, code, args);
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_encrypt_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_sign_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -117,8 +117,12 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
|
|||||||
static gpgme_error_t
|
static gpgme_error_t
|
||||||
encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_passphrase_status_handler (priv, code, args);
|
|
||||||
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_passphrase_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -236,8 +236,12 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
|||||||
static gpgme_error_t
|
static gpgme_error_t
|
||||||
sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_sign_status_handler (priv, code, args);
|
|
||||||
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_sign_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -532,8 +532,12 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
|||||||
static gpgme_error_t
|
static gpgme_error_t
|
||||||
verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
|
||||||
{
|
{
|
||||||
return _gpgme_progress_status_handler (priv, code, args)
|
gpgme_error_t err;
|
||||||
|| _gpgme_verify_status_handler (priv, code, args);
|
|
||||||
|
err = _gpgme_progress_status_handler (priv, code, args);
|
||||||
|
if (!err)
|
||||||
|
err = _gpgme_verify_status_handler (priv, code, args);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user