From 3244d4daff892d5d3c39e78f4eb0934379beda2c Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 16 Aug 2017 01:50:00 +0200 Subject: gpgconf: Fix some warnings. * tests/gpg/t-gpgconf.c (main): Fix warnings. * src/engine-gpgconf.c (struct gpgconf_config_dir_s): New struct. (gpgconf_config_dir_cb, gpgconf_conf_dir) Use it to fix warning. Signed-off-by: Marcus Brinkmann --- tests/gpg/t-gpgconf.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c index 8c81de69..5eccedeb 100644 --- a/tests/gpg/t-gpgconf.c +++ b/tests/gpg/t-gpgconf.c @@ -263,22 +263,25 @@ main (void) err = gpgme_new (&ctx); fail_if_err (err); - /* Let's check getting the agent-socket directory for different homedirs. */ - char *result1 = NULL; - err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, "/tmp/foo"); - fail_if_err (err); - err = gpgme_op_conf_dir (ctx, "agent-socket", &result1); - fail_if_err (err); - - char *result2 = NULL; - err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, NULL); - fail_if_err (err); - err = gpgme_op_conf_dir (ctx, "agent-socket", &result2); - fail_if_err (err); + { + /* Let's check getting the agent-socket directory for different homedirs. */ + char *result1 = NULL; + char *result2 = NULL; + err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, "/tmp/foo"); + fail_if_err (err); + err = gpgme_op_conf_dir (ctx, "agent-socket", &result1); + fail_if_err (err); - /* They have to be different. */ - test (strcmp(result1, result2)); + err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, NULL); + fail_if_err (err); + err = gpgme_op_conf_dir (ctx, "agent-socket", &result2); + fail_if_err (err); + /* They have to be different. */ + test (strcmp(result1, result2)); + gpgme_free (result1); + gpgme_free (result2); + } err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); -- cgit v1.2.3