diff options
| author | Andre Heinecke <aheinecke@gnupg.org> | 2019-06-05 16:08:54 +0200 |
|---|---|---|
| committer | Andre Heinecke <aheinecke@gnupg.org> | 2019-06-05 16:20:31 +0200 |
| commit | 3a11421d0f63b8cb5afa407cd65f763b11033241 (patch) | |
| tree | 6803a4bc8c69bd1b1aaac64aebca6bd5fbf03832 /tests/run-threaded.c | |
| parent | 9bbe15ebbc41533fa219d5b3017a26a75bc72731 (diff) | |
| download | gpgme-3a11421d0f63b8cb5afa407cd65f763b11033241.tar.gz | |
tests: Avoid variable named the same as a macro
* 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.
Diffstat (limited to 'tests/run-threaded.c')
| -rw-r--r-- | tests/run-threaded.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/run-threaded.c b/tests/run-threaded.c index 7041da8d..60402c13 100644 --- a/tests/run-threaded.c +++ b/tests/run-threaded.c @@ -378,7 +378,7 @@ verify (const char *fname, gpgme_protocol_t proto) { gpgme_ctx_t ctx; gpgme_error_t err; - gpgme_data_t out; + gpgme_data_t output; char *msg; size_t msg_len; 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, proto == GPGME_PROTOCOL_CMS ? "CMS" : "OpenPGP"); - gpgme_data_new (&out); + gpgme_data_new (&output); err = gpgme_new (&ctx); fail_if_err (err); @@ -394,13 +394,13 @@ verify (const char *fname, gpgme_protocol_t proto) err = gpgme_set_protocol (ctx, proto); 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, data->fd, data->file, data->stream, data->mem); 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) { @@ -423,14 +423,14 @@ decrypt (const char *fname, gpgme_protocol_t proto) { gpgme_ctx_t ctx; gpgme_error_t err; - gpgme_data_t out; + gpgme_data_t output; char *msg; size_t msg_len; data_t data = random_data_new (fname); log ("Starting decrypt on: %s", fname); - gpgme_data_new (&out); + gpgme_data_new (&output); err = gpgme_new (&ctx); fail_if_err (err); @@ -438,12 +438,12 @@ decrypt (const char *fname, gpgme_protocol_t proto) err = gpgme_set_protocol (ctx, proto); fail_if_err (err); - err = gpgme_op_decrypt (ctx, data->dh, out); + err = gpgme_op_decrypt (ctx, data->dh, output); fail_if_err (err); 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) { |