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

tests: Avoid variable named the same as a macro

Browse Source 
* tests/run-threaded.c (decrypt, verify): Don't use a variable name
that is also a macro.

--
It just looks confusing and strange at first glance.
This commit is contained in:
Andre Heinecke 2019-06-05 16:08:54 +02:00
parent 9bbe15ebbc
commit 3a11421d0f
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/run-threaded.c
View File

@ -378,7 +378,7 @@ verify (const char *fname, gpgme_protocol_t proto)
{ {
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_data_t out; gpgme_data_t output;
char *msg; char *msg;
size_t msg_len; size_t msg_len;
data_t data = random_data_new (fname); data_t data = random_data_new (fname);
@ -386,7 +386,7 @@ verify (const char *fname, gpgme_protocol_t proto)
log ("Starting verify on: %s with protocol %s", fname, log ("Starting verify on: %s with protocol %s", fname,
proto == GPGME_PROTOCOL_CMS ? "CMS" : "OpenPGP"); proto == GPGME_PROTOCOL_CMS ? "CMS" : "OpenPGP");
gpgme_data_new (&out); gpgme_data_new (&output);
err = gpgme_new (&ctx); err = gpgme_new (&ctx);
fail_if_err (err); fail_if_err (err);
@ -394,13 +394,13 @@ verify (const char *fname, gpgme_protocol_t proto)
err = gpgme_set_protocol (ctx, proto); err = gpgme_set_protocol (ctx, proto);
fail_if_err (err); fail_if_err (err);
err = gpgme_op_verify (ctx, data->dh, NULL, out); err = gpgme_op_verify (ctx, data->dh, NULL, output);
out ("Data: %p, %i %p %p %p", data->dh, out ("Data: %p, %i %p %p %p", data->dh,
data->fd, data->file, data->stream, data->fd, data->file, data->stream,
data->mem); data->mem);
fail_if_err (err); fail_if_err (err);
msg = gpgme_data_release_and_get_mem (out, &msg_len); msg = gpgme_data_release_and_get_mem (output, &msg_len);
if (msg_len) if (msg_len)
{ {
@ -423,14 +423,14 @@ decrypt (const char *fname, gpgme_protocol_t proto)
{ {
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_data_t out; gpgme_data_t output;
char *msg; char *msg;
size_t msg_len; size_t msg_len;
data_t data = random_data_new (fname); data_t data = random_data_new (fname);
log ("Starting decrypt on: %s", fname); log ("Starting decrypt on: %s", fname);
gpgme_data_new (&out); gpgme_data_new (&output);
err = gpgme_new (&ctx); err = gpgme_new (&ctx);
fail_if_err (err); fail_if_err (err);
@ -438,12 +438,12 @@ decrypt (const char *fname, gpgme_protocol_t proto)
err = gpgme_set_protocol (ctx, proto); err = gpgme_set_protocol (ctx, proto);
fail_if_err (err); fail_if_err (err);
err = gpgme_op_decrypt (ctx, data->dh, out); err = gpgme_op_decrypt (ctx, data->dh, output);
fail_if_err (err); fail_if_err (err);
gpgme_release (ctx); gpgme_release (ctx);
msg = gpgme_data_release_and_get_mem (out, &msg_len); msg = gpgme_data_release_and_get_mem (output, &msg_len);
if (msg_len) if (msg_len)
{ {