From 65ecec1abe9ce864060f61f03d025fe98e7cbf55 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 5 Nov 2009 02:17:07 +0000 Subject: 2009-11-05 Marcus Brinkmann * decrypt.c (gpgme_op_decrypt_start): Fix use of debug macro. * decrypt-verify.c (gpgme_op_decrypt_verify_start): Likewise. * delete.c (gpgme_op_delete_start): Likewise. * edit.c (gpgme_op_edit_start, gpgme_op_card_edit_start): Likewise. * encrypt.c (gpgme_op_encrypt_start): Likewise. * encrypt-sign.c (gpgme_op_encrypt_sign_start): Likewise. * export.c (gpgme_op_export_start, gpgme_op_export_ext_start) (gpgme_op_export_keys_start, gpgme_op_export_keys): Likewise. * genkey.c (gpgme_op_genkey_start): Likewise. * getauditlog.c (gpgme_op_getauditlog_start): Likewise. * import.c (gpgme_op_import_start, gpgme_op_import_keys_start): Likewise. * opassuan.c (gpgme_op_assuan_transact_start): Likewise. * sign.c (gpgme_op_sign_start): Likewise. * verify.c (gpgme_op_verify_start): Likewise. * vfs-create.c (gpgme_op_vfs_create): Likewise. * vfs-mount.c (gpgme_op_vfs_mount): Likewise. --- src/gpgme-tool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpgme-tool.c') diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index 307558a6..54d793cf 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -1041,7 +1041,7 @@ gt_vfs_mount (gpgme_tool_t gt, const char *container_file, gpg_error_t err; gpg_error_t op_err; err = gpgme_op_vfs_mount (gt->ctx, container_file, mount_dir, flags, &op_err); - return err || op_err; + return err ? err : op_err; } @@ -1053,7 +1053,7 @@ gt_vfs_create (gpgme_tool_t gt, const char *container_file, int flags) err = gpgme_op_vfs_create (gt->ctx, gt->recipients, container_file, flags, &op_err); gt_recipients_clear (gt); - return err || op_err; + return err ? err : op_err; } -- cgit v1.2.3