Fix cppcheck errors

Declare a bunch of pointers const that cppcheck figured out were
never written to. Add some more cppcheck exclusions for constructs
that it can't understand, and move a variable initialization to
make cppcheck happy.

Author: rra

portable/getnameinfo.c

@@ -17,7 +17,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2005, 2020 Russ Allbery <[email protected]>
+ * Copyright 2005, 2020, 2024 Russ Allbery <[email protected]>
  * Copyright 2008, 2011, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -108,10 +108,10 @@ static int
 lookup_name(const struct in_addr *addr, char *node, socklen_t nodelen,
             int flags)
 {
-    struct hostent *host;
+    const struct hostent *host;
     char **alias;
     int status;
-    char *name;
+    const char *name;
     size_t namelen;
 
     /* Do the name lookup first unless told not to. */
@@ -155,7 +155,7 @@ static int
 lookup_service(unsigned short port, char *service, socklen_t servicelen,
                int flags)
 {
-    struct servent *srv;
+    const struct servent *srv;
     const char *protocol;
     int status;
     size_t namelen;

tests/data/cppcheck.supp

@@ -17,6 +17,10 @@
 //
 // SPDX-License-Identifier: FSFAP
 
+// I'm not going to add const to every callback function and then cast the
+// function type when passing in the callback.
+constParameterCallback
+
 // I like declaring variables at the top of a function rather than cluttering
 // every if and loop body with declarations.
 variableScope
@@ -25,6 +29,13 @@ variableScope
 // string length.
 constArgument:tests/runtests.c:804
 
+// cppcheck doesn't understand some cases where prototypes have to match
+// or where const is added via macros such as PAM_CONST.
+constParameterPointer:pam-util/options.c:469
+constParameterPointer:tests/fakepam/data.c:150
+constParameterPointer:tests/fakepam/general.c:131
+constParameterPointer:tests/fakepam/logging.c:100
+
 // False positive due to recursive function.
 knownConditionTrueFalse:portable/getopt.c:146
 
@@ -59,6 +70,11 @@ nullPointerRedundantCheck:tests/plugin/mit-t.c:97
 // Setting the variable to NULL explicitly after deallocation.
 redundantAssignment:tests/pam-util/options-t.c
 
+// Bug in cppcheck 2.7.  Two possible struct layouts are chosen based on the
+// ABI, and the one chosen is used, but cppcheck always warns about both even
+// if the preprocessor conditionals are identical.
+unusedStructMember:kafs/sys-solaris.c
+
 // (remctl) Bug in cppcheck 1.89 (fixed in 2.3).  The address of these
 // variables are passed to a PHP function.
 uninitvar:php/php_remctl.c:119
@@ -75,8 +91,3 @@ redundantAssignment:tests/server/acl-t.c
 // (pam-krb5) cppcheck doesn't recognize the unused attribute on labels.
 unusedLabel:module/auth.c:895
 unusedLabelConfiguration:module/auth.c:895
-
-// Bug in cppcheck 2.7.  Two possible struct layouts are chosen based on the
-// ABI, and the one chosen is used, but cppcheck always warns about both even
-// if the preprocessor conditionals are identical.
-unusedStructMember:kafs/sys-solaris.c

tests/fakepam/config.c

@@ -10,7 +10,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2017-2018, 2020 Russ Allbery <[email protected]>
+ * Copyright 2017-2018, 2020, 2024 Russ Allbery <[email protected]>
  * Copyright 2011-2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -157,7 +157,8 @@ static char *
 readline(FILE *file)
 {
     char buffer[BUFSIZ];
-    char *line, *first;
+    char *line;
+    const char *first;
 
     do {
         line = fgets(buffer, sizeof(buffer), file);
@@ -426,7 +427,7 @@ static void
 split_options(char *string, struct options *options,
               const struct script_config *config)
 {
-    char *opt;
+    const char *opt;
     size_t size, count;
 
     for (opt = strtok(string, " "); opt != NULL; opt = strtok(NULL, " ")) {
@@ -462,7 +463,8 @@ static void
 parse_options(FILE *script, struct work *work,
               const struct script_config *config)
 {
-    char *line, *group, *token;
+    char *line, *token;
+    const char *group;
     size_t length = 0;
     enum group_type type;
 
@@ -497,9 +499,10 @@ parse_options(FILE *script, struct work *work,
  * action struct to fill in with the call and the option flags.
  */
 static void
-parse_call(char *token, struct action *action)
+parse_call(const char *token, struct action *action)
 {
-    char *flags, *flag;
+    char *flags;
+    const char *flag;
 
     action->flags = 0;
     flags = strchr(token, '(');
@@ -528,7 +531,8 @@ static struct action *
 parse_run(FILE *script)
 {
     struct action *head = NULL, *current = NULL, *next;
-    char *line, *token, *call;
+    char *line, *token;
+    const char *call;
     size_t length = 0;
 
     for (line = readline(script); line != NULL; line = readline(script)) {
@@ -576,7 +580,8 @@ parse_run(FILE *script)
 static int
 parse_end(FILE *script)
 {
-    char *line, *token, *flag;
+    char *line, *token;
+    const char *flag;
     size_t length = 0;
     int flags = PAM_SUCCESS;
 
@@ -622,7 +627,8 @@ parse_end(FILE *script)
 static struct output *
 parse_output(FILE *script, const struct script_config *config)
 {
-    char *line, *token, *message;
+    char *line, *message;
+    const char *token;
     struct output *output;
     int priority;
 
@@ -662,7 +668,8 @@ parse_prompts(FILE *script, const struct script_config *config)
 {
     struct prompts *prompts = NULL;
     struct prompt *prompt;
-    char *line, *token, *style, *end;
+    char *line, *token, *end;
+    const char *style;
     size_t size, count, i;
     size_t length = 0;
 

tests/fakepam/data.c

@@ -9,7 +9,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2017, 2020 Russ Allbery <[email protected]>
+ * Copyright 2017, 2020, 2024 Russ Allbery <[email protected]>
  * Copyright 2010-2011, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -51,7 +51,7 @@
 int
 pam_get_data(const pam_handle_t *pamh, const char *name, const void **data)
 {
-    struct fakepam_data *item;
+    const struct fakepam_data *item;
 
     for (item = pamh->data; item != NULL; item = item->next)
         if (strcmp(item->name, name) == 0) {

tests/portable/getaddrinfo-t.c

@@ -49,9 +49,9 @@ main(void)
     struct addrinfo *ai, *first;
     struct addrinfo hints;
     struct sockaddr_in *saddr;
-    struct hostent *host;
+    const struct hostent *host;
     struct in_addr addr, *addrs;
-    struct servent *service;
+    const struct servent *service;
     int i, result, count;
     int found;
 

tests/portable/getnameinfo-t.c

@@ -5,7 +5,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2005-2006, 2014, 2018, 2022-2023 Russ Allbery <[email protected]>
+ * Copyright 2005-2006, 2014, 2018, 2022-2024 Russ Allbery <[email protected]>
  * Copyright 2007-2011
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -37,10 +37,10 @@ main(void)
 {
     char node[256], service[256];
     struct sockaddr_in sin;
-    struct sockaddr *sa = (struct sockaddr *) &sin;
+    const struct sockaddr *sa;
     int status;
     struct hostent *hp;
-    struct servent *serv;
+    const struct servent *serv;
     char *name;
 
     plan(26);
@@ -52,6 +52,7 @@ main(void)
      * the same port, but with different protocols.
      */
     memset(&sin, 0, sizeof(sin));
+    sa = (struct sockaddr *) &sin;
     sin.sin_family = AF_INET;
     sin.sin_port = htons(119);
     inet_aton("10.20.30.40", &sin.sin_addr);

tests/runtests.c

@@ -8,7 +8,8 @@
  * should be sent to the e-mail address below.  This program is part of C TAP
  * Harness <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
- * Copyright 2000-2001, 2004, 2006-2019, 2022 Russ Allbery <[email protected]>
+ * Copyright 2000-2001, 2004, 2006-2019, 2022, 2024
+ *     Russ Allbery <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -994,7 +995,7 @@ test_print_range(unsigned long first, unsigned long last, unsigned long chars,
  * that terminated it if it was killed by a signal.
  */
 static void
-test_summarize(struct testset *ts, int status)
+test_summarize(const struct testset *ts, int status)
 {
     unsigned long i;
     unsigned long missing = 0;

tests/tap/basic.c

@@ -13,7 +13,7 @@
  * documentation is at <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2009-2019, 2021 Russ Allbery <[email protected]>
+ * Copyright 2009-2019, 2021, 2024 Russ Allbery <[email protected]>
  * Copyright 2001-2002, 2004-2008, 2011-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -920,7 +920,7 @@ bstrndup(const char *s, size_t n)
 char *
 test_file_path(const char *file)
 {
-    char *base;
+    const char *base;
     char *path = NULL;
     const char *envs[] = {"C_TAP_BUILD", "C_TAP_SOURCE", NULL};
     int i;

tests/tap/remctl.c

@@ -8,7 +8,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2018, 2020 Russ Allbery <[email protected]>
+ * Copyright 2018, 2020, 2024 Russ Allbery <[email protected]>
  * Copyright 2006-2007, 2009, 2011-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -63,8 +63,8 @@
  * not set, remctld_start_internal calls skip_all.
  */
 static struct process *
-remctld_start_internal(struct kerberos_config *krbconf, const char *config,
-                       va_list args, bool fakeroot)
+remctld_start_internal(const struct kerberos_config *krbconf,
+                       const char *config, va_list args, bool fakeroot)
 {
     va_list args_copy;
     char *tmpdir, *pidfile, *confpath;
@@ -141,7 +141,7 @@ remctld_start_internal(struct kerberos_config *krbconf, const char *config,
  * Just calls remctld_start_internal without enabling fakeroot support.
  */
 struct process *
-remctld_start(struct kerberos_config *krbconf, const char *config, ...)
+remctld_start(const struct kerberos_config *krbconf, const char *config, ...)
 {
     va_list args;
     struct process *process;
@@ -157,8 +157,8 @@ remctld_start(struct kerberos_config *krbconf, const char *config, ...)
  * Just calls remctld_start_internal with fakeroot enabled.
  */
 struct process *
-remctld_start_fakeroot(struct kerberos_config *krbconf, const char *config,
-                       ...)
+remctld_start_fakeroot(const struct kerberos_config *krbconf,
+                       const char *config, ...)
 {
     va_list args;
     struct process *process;

tests/tap/remctl.h

@@ -8,6 +8,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
+ * Copyright 2024 Russ Allbery <[email protected]>
  * Copyright 2006-2007, 2009, 2011-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -64,15 +65,16 @@ BEGIN_DECLS
  * config.h.  If it's not defined, remctld_start calls skip_all, assuming that
  * this means that the test case cannot be run.
  */
-struct process *remctld_start(struct kerberos_config *, const char *config,
-                              ...) __attribute__((__nonnull__(1, 2)));
+struct process *remctld_start(const struct kerberos_config *,
+                              const char *config, ...)
+    __attribute__((__nonnull__(1, 2)));
 
 /*
  * Like remctld_start, but run remctld under fakeroot.  Calls skip_all if
  * PATH_FAKEROOT is not defined, either with explicit compiler options or in
  * config.h.
  */
-struct process *remctld_start_fakeroot(struct kerberos_config *,
+struct process *remctld_start_fakeroot(const struct kerberos_config *,
                                        const char *config, ...)
     __attribute__((__nonnull__(1, 2)));
 

util/buffer.c

@@ -16,7 +16,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2015-2016, 2019 Russ Allbery <[email protected]>
+ * Copyright 2015-2016, 2019, 2024 Russ Allbery <[email protected]>
  * Copyright 2011-2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
@@ -241,7 +241,8 @@ bool
 buffer_find_string(struct buffer *buffer, const char *string, size_t start,
                    size_t *offset)
 {
-    char *terminator, *data;
+    char *data;
+    const char *terminator;
     size_t length;
 
     if (buffer->data == NULL)

util/network.c

@@ -20,7 +20,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <[email protected]>
- * Copyright 2014-2017 Russ Allbery <[email protected]>
+ * Copyright 2014-2017, 2024 Russ Allbery <[email protected]>
  * Copyright 2009, 2011-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2004-2008 Internet Systems Consortium, Inc. ("ISC")
@@ -278,7 +278,8 @@ bool
 network_bind_all(int type, unsigned short port, socket_type **fds,
                  unsigned int *count)
 {
-    struct addrinfo hints, *addrs, *addr;
+    struct addrinfo hints, *addrs;
+    const struct addrinfo *addr;
     unsigned int size;
     int status;
     socket_type fd;