security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

common,agent,dirmngr,g10,tools: Fix split_fields API.

Browse source 
* 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:
NIIBE Yutaka 2020-09-18 10:20:23 +09:00
parent 8ff3663027
commit dfdcf14738
15 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/stringhelp.c
View file

@ -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

4
common/stringhelp.h
View file

@ -151,11 +151,11 @@ char **strtokenize (const char *string, const char *delim);
/* Split STRING into space delimited fields and store them in the
* provided ARRAY. */
int split_fields (char *string, char **array, int arraysize);
int split_fields (char *string, const char **array, int arraysize);
/* Split STRING into colon delimited fields and store them in the
* provided ARRAY. */
int split_fields_colon (char *string, char **array, int arraysize);
int split_fields_colon (char *string, const char **array, int arraysize);
/* Return True if MYVERSION is greater or equal than REQ_VERSION. */
int compare_version_strings (const char *my_version, const char *req_version);

4
common/t-stringhelp.c
View file

@ -717,7 +717,7 @@ test_split_fields (void)
};
int tidx;
char *fields[10];
const char *fields[10];
int field_count_expected, nfields, field_count, i;
char *s2;
@ -792,7 +792,7 @@ test_split_fields_colon (void)
};
int tidx;
char *fields[10];
const char *fields[10];
int field_count_expected, nfields, field_count, i;
char *s2;