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/gpgconf-comp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/gpgconf-comp.c') diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index d6cc14c28..4dae7b49d 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1553,8 +1553,8 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed) while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0) { - char *fields[4]; - char *optname, *optdesc; + const char *fields[4]; + const char *optname, *optdesc; unsigned int optflags; int short_opt; gc_arg_type_t arg_type; @@ -1621,8 +1621,8 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed) string_array_size, sizeof *string_array); } - string_array[string_array_used++] = optname = xstrdup (fields[0]); - string_array[string_array_used++] = optdesc = xstrdup (fields[3]); + optname = string_array[string_array_used++] = xstrdup (fields[0]); + optdesc = string_array[string_array_used++] = xstrdup (fields[3]); /* Create an option table which can then be supplied to * gpgrt_parser. Unfortunately there is no private pointer in -- cgit v1.2.3