mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
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 <gniibe@fsij.org>
This commit is contained in:
parent
8ff3663027
commit
dfdcf14738
15 changed files with 33 additions and 31 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue