From 98244ec036096c7571d3bc3782baccab4c7565db Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 17 Jan 2020 23:46:42 +0000 Subject: _pam_mkargv: add const qualifier to the first argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fix the following compilation warning: tests/tst-pam_mkargv.c:21:22: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] char *argvstring = "user = XENDT\\userα user=XENDT\\user1"; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * libpam/pam_misc.c (_pam_mkargv): Add const qualifier to the first argument. * libpam/pam_private.h (_pam_mkargv): Likewise. * tests/tst-pam_mkargv.c (main): Convert argvstring from a pointer into a static const string, make argvresult array static const. --- tests/tst-pam_mkargv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/tst-pam_mkargv.c b/tests/tst-pam_mkargv.c index d3e7a616..cb005e5f 100644 --- a/tests/tst-pam_mkargv.c +++ b/tests/tst-pam_mkargv.c @@ -18,16 +18,16 @@ /* Simple program to see if _pam_mkargv() would succeed. */ int main(void) { - char *argvstring = "user = XENDT\\userα user=XENDT\\user1"; - const char *argvresult[] = {"user", "=", "XENDT\\userα", - "user=XENDT\\user1"}; + static const char argvstring[] = "user = XENDT\\userα user=XENDT\\user1"; + static const char * const argvresult[] = {"user", "=", "XENDT\\userα", + "user=XENDT\\user1"}; int myargc; char **myargv; int argvlen; int explen; int i; - explen = (strlen(argvstring) + 1) * ((sizeof(char)) + sizeof(char *)); + explen = sizeof(argvstring) * ((sizeof(char)) + sizeof(char *)); argvlen = _pam_mkargv(argvstring, &myargv, &myargc); #if 0 -- cgit v1.2.3