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 --- g10/call-agent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/call-agent.c') diff --git a/g10/call-agent.c b/g10/call-agent.c index 42e2d3720..1fa77e7be 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -842,7 +842,7 @@ scd_keypairinfo_status_cb (void *opaque, const char *line) /* The format of such a line is: * KEYPAIRINFO [usage] [keytime] */ - char *fields[4]; + const char *fields[4]; int nfields; const char *hexgrp, *keyref, *usage; time_t atime; @@ -1467,7 +1467,7 @@ readkey_status_cb (void *opaque, const char *line) * Note that we use only the first valid KEYPAIRINFO line. More * lines are possible if a second card carries the same key. */ - char *fields[4]; + const char *fields[4]; int nfields; time_t atime; @@ -2099,7 +2099,7 @@ keyinfo_status_cb (void *opaque, const char *line) * 6 7 8 * */ - char *fields[9]; + const char *fields[9]; if (split_fields (s, fields, DIM (fields)) == 9) { -- cgit v1.2.3