From dfdcf14738976c6b236f4fa1c3b68af351024b3c Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 18 Sep 2020 10:20:23 +0900 Subject: common,agent,dirmngr,g10,tools: Fix split_fields API. * common/stringhelp.h (split_fields): Use const * for the strings in the ARRAY. (split_fields_colon): Likewise. * common/stringhelp.c (split_fields, split_fields_colon): Fix the implementation. * agent/call-scd.c, agent/command.c: Follow the change. * common/t-stringhelp.c, dirmngr/loadswdb.c: Likewise. * g10/call-agent.c, tools/card-call-scd.c: Likewise. * tools/card-yubikey.c, tools/gpg-card.c: Likewise. * tools/gpg-card.h, tools/gpg-wks-client.c: Likewise. * tools/gpgconf-comp.c, tools/gpgconf.c: Likewise. * tools/wks-util.c: Likewise. -- The strings in the ARRAY don't need to be released by caller, as those are references. It's easier to follow the code when it's explicitly const *. Signed-off-by: NIIBE Yutaka --- tools/gpg-card.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/gpg-card.c') diff --git a/tools/gpg-card.c b/tools/gpg-card.c index 9238b4759..ba48905e2 100644 --- a/tools/gpg-card.c +++ b/tools/gpg-card.c @@ -2189,11 +2189,11 @@ cmd_writekey (card_info_t info, char *argstr) { gpg_error_t err; int opt_force; - char *argv[2]; + const char *argv[2]; int argc; char *keyref_buffer = NULL; - char *keyref; - char *keygrip; + const char *keyref; + const char *keygrip; if (!info) return print_help @@ -3376,7 +3376,7 @@ cmd_yubikey (card_info_t info, char *argstr) { gpg_error_t err, err2; estream_t fp = opt.interactive? NULL : es_stdout; - char *words[20]; + const char *words[20]; int nwords; if (!info) -- cgit v1.2.3