diff options
| author | NIIBE Yutaka <[email protected]> | 2020-09-18 01:20:23 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-09-18 01:20:23 +0000 |
| commit | dfdcf14738976c6b236f4fa1c3b68af351024b3c (patch) | |
| tree | 40a28138343e29b0c03c97653e22223e8de2f116 /common/stringhelp.c | |
| parent | scd: Clear PIN cache when changing key attributes. (diff) | |
| download | gnupg-dfdcf14738976c6b236f4fa1c3b68af351024b3c.tar.gz gnupg-dfdcf14738976c6b236f4fa1c3b68af351024b3c.zip | |
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 <[email protected]>
Diffstat (limited to 'common/stringhelp.c')
| -rw-r--r-- | common/stringhelp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/stringhelp.c b/common/stringhelp.c index d7bb6bc37..a324bfbbc 100644 --- a/common/stringhelp.c +++ b/common/stringhelp.c @@ -1363,10 +1363,11 @@ strtokenize (const char *string, const char *delim) * foo (fields[1]); */ int -split_fields (char *string, char **array, int arraysize) +split_fields (char *string, const char **array, int arraysize) { int n = 0; - char *p, *pend; + const char *p; + char *pend; for (p = string; *p == ' '; p++) ; @@ -1401,10 +1402,11 @@ split_fields (char *string, char **array, int arraysize) * foo (fields[1]); */ int -split_fields_colon (char *string, char **array, int arraysize) +split_fields_colon (char *string, const char **array, int arraysize) { int n = 0; - char *p, *pend; + const char *p; + char *pend; p = string; do |