qual: Fix multiple 'obvious' cppcheck notices.

MDW · MDW · commit 2699c87c8233 · 2026-06-08T15:04:49.000+02:00
diff --git a/access.c b/access.c
@@ -112,7 +112,7 @@ static int match_address(const char *addr, char *tok)
 	int bits;
 #endif
 	char mask[16];
-	char *a = NULL, *t = NULL;
+	const char *a = NULL, *t = NULL;
 
 	if (!addr || !*addr)
 		return 0;
diff --git a/batch.c b/batch.c
@@ -132,7 +132,7 @@ void check_batch_flags(void)
 	tweaked_iconv = iconv_opt != NULL;
 #endif
 	for (i = 0; flag_ptr[i]; i++) {
-		int set = batch_stream_flags & (1 << i) ? 1 : 0;
+		int set = (batch_stream_flags & (1 << i)) ? 1 : 0;
 		if (*flag_ptr[i] != set) {
 			if (i == 9) {
 				rprintf(FERROR,
diff --git a/checksum.c b/checksum.c
@@ -286,7 +286,7 @@ uint32 get_checksum1(char *buf1, int32 len)
 {
 	int32 i;
 	uint32 s1, s2;
-	schar *buf = (schar *)buf1;
+	const schar *buf = (schar *)buf1;
 
 	s1 = s2 = 0;
 	for (i = 0; i < (len-4); i+=4) {
diff --git a/clientserver.c b/clientserver.c
@@ -119,7 +119,8 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
 			int argc, char *argv[])
 {
 	int fd, ret;
-	char *p, *user = NULL;
+	char *p;
+        const char *user = NULL;
 
 	/* This is redundant with code in start_inband_exchange(), but this
 	 * short-circuits a problem in the client before we open a socket,
@@ -156,7 +157,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
 
 	output_daemon_greeting(f_out, am_client);
 	if (!am_client) {
-		char *motd = lp_motd_file();
+		const char *motd = lp_motd_file();
 		if (motd && *motd) {
 			FILE *f = fopen(motd, "r");
 			while (f && !feof(f)) {
@@ -323,7 +324,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
 				} while ((p = strstr(p+1, line)) != NULL);
 			}
 			if (extra_chars) {
-				char *f = arg;
+				const char *f = arg;
 				char *t = arg = new_array(char, strlen(arg) + extra_chars + 1);
 				if (*f == '-') {
 					*t++ = '.';
@@ -1155,9 +1156,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 			 * Without this, the socket would be in the wrong
 			 * state for the upcoming error message. */
 			if (!files_from) {
-				int i;
-				for (i = 0; i < argc; i++) {
-					if (strncmp(argv[i], "--files-from", 12) == 0) {
+				int arg_idx;
+				for (arg_idx = 0; arg_idx < argc; arg_idx++) {
+					if (strncmp(argv[arg_idx], "--files-from", 12) == 0) {
 						files_from = "";
 						break;
 					}
diff --git a/compat.c b/compat.c
@@ -184,7 +184,7 @@ void parse_compress_choice(int final_call)
 	if (valid_compressions.negotiated_nni)
 		do_compression = valid_compressions.negotiated_nni->num;
 	else if (compress_choice) {
-		struct name_num_item *nni = get_nni_by_name(&valid_compressions, compress_choice, -1);
+		struct name_num_item const * const nni = get_nni_by_name(&valid_compressions, compress_choice, -1);
 		if (!nni) {
 			rprintf(FERROR, "unknown compress name: %s\n", compress_choice);
 			exit_cleanup(RERR_UNSUPPORTED);
@@ -292,7 +292,7 @@ static int parse_nni_str(struct name_num_obj *nno, const char *from, char *tobuf
 			ch = '\0';
 		if (!ch || at_space) {
 			if (tok) {
-				struct name_num_item *nni = get_nni_by_name(nno, tok, to - tok);
+				struct name_num_item const * const nni = get_nni_by_name(nno, tok, to - tok);
 				if (nni && !nno->saw[nni->num]) {
 					nno->saw[nni->num] = ++cnt;
 					if (nni->main_nni) {
@@ -743,11 +743,11 @@ void setup_protocol(int f_out,int f_in)
 				do_negotiated_strings = 1;
 		}
 		/* The inc_recurse var MUST be set to 0 or 1. */
-		inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
+		inc_recurse = (compat_flags & CF_INC_RECURSE) ? 1 : 0;
 		want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
-		proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
-		xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
-		xmit_id0_names = compat_flags & CF_ID0_NAMES ? 1 : 0;
+		proper_seed_order = (compat_flags & CF_CHKSUM_SEED_FIX) ? 1 : 0;
+		xfer_flags_as_varint = (compat_flags & CF_VARINT_FLIST_FLAGS) ? 1 : 0;
+		xmit_id0_names = (compat_flags & CF_ID0_NAMES) ? 1 : 0;
 		if (!xfer_flags_as_varint && preserve_crtimes) {
 			fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --crtimes.\n");
 			exit_cleanup(RERR_PROTOCOL);
diff --git a/exclude.c b/exclude.c
@@ -778,7 +778,7 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
 
 	push->mergelist_cnt = mergelist_cnt;
 	for (i = 0; i < mergelist_cnt; i++) {
-		filter_rule *ex = mergelist_parents[i];
+		const filter_rule *ex = mergelist_parents[i];
 		if (!ex)
 			continue;
 		memcpy(&push->mergelists[i], ex->u.mergelist, sizeof (filter_rule_list));
@@ -903,15 +903,15 @@ void change_local_filter_dir(const char *dname, int dlen, int dir_depth)
 static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
 {
 	int slash_handling, str_cnt = 0, anchored_match = 0;
-	int ret_match = ex->rflags & FILTRULE_NEGATE ? 0 : 1;
+	int ret_match = (ex->rflags & FILTRULE_NEGATE) ? 0 : 1;
 	const char *p, *pattern = ex->pattern;
 	const char *strings[16]; /* more than enough */
 	const char *name = fname + (*fname == '/');
 
-	if (!*name || ex->elide == cur_elide_value)
+	if (!*name || (ex->elide == cur_elide_value))
 		return 0;
 
-	if (!(name_flags & NAME_IS_XATTR) ^ !(ex->rflags & FILTRULE_XATTR))
+	if (!(name_flags & NAME_IS_XATTR) != !(ex->rflags & FILTRULE_XATTR))
 		return 0;
 
 	if (!ex->u.slash_cnt && !(ex->rflags & FILTRULE_WILD2)) {
@@ -1057,7 +1057,7 @@ int check_filter(filter_rule_list *listp, enum logcode code,
 		}
 		if (rule_matches(name, ent, name_flags)) {
 			report_filter_result(code, name, ent, name_flags, listp->debug_type);
-			return ent->rflags & FILTRULE_INCLUDE ? 1 : -1;
+			return (ent->rflags & FILTRULE_INCLUDE) ? 1 : -1;
 		}
 	}
 
@@ -1448,7 +1448,7 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
 {
 	FILE *fp;
 	char line[BIGPATHBUFLEN];
-	char *eob = line + sizeof line - 1;
+	const char *eob = line + sizeof line - 1;
 	BOOL word_split = (template->rflags & FILTRULE_WORD_SPLIT) != 0;
 
 	if (!fname || !*fname)
@@ -1629,7 +1629,7 @@ static void send_rules(int f_out, filter_rule_list *flp)
 		if (f_out < 0)
 			continue;
 		len = strlen(ent->pattern);
-		dlen = ent->rflags & FILTRULE_DIRECTORY ? 1 : 0;
+		dlen = (ent->rflags & FILTRULE_DIRECTORY) ? 1 : 0;
 		if (!(plen + len + dlen))
 			continue;
 		write_int(f_out, plen + len + dlen);
diff --git a/getgroups.c b/getgroups.c
@@ -23,7 +23,7 @@
  int main(UNUSED(int argc), UNUSED(char *argv[]))
 {
 	int n, i;
-	gid_t *list;
+	const gid_t *list;
 	gid_t gid = MY_GID();
 	int gid_in_list = 0;
 
diff --git a/loadparm.c b/loadparm.c
@@ -180,7 +180,7 @@ static char *expand_vars(const char *str)
 		if (*f == '%' && isUpper(f+1)) {
 			const char *percent = strchr(f+1, '%');
 			if (percent && percent - f < bufsize) {
-				char *val;
+				const char *val;
 				strlcpy(t, f+1, percent - f);
 				val = getenv(t);
 				if (val) {
@@ -485,7 +485,7 @@ static BOOL do_section(char *sectionname)
 			memcpy(vp, &Vars, sizeof Vars);
 		} else if (strcmp(sectionname+1, "pop") == 0
 		 || strcmp(sectionname+1, "reset") == 0) {
-			all_vars *vp = ((all_vars*)Vars_stack.items) + Vars_stack.count - 1;
+			const all_vars *vp = ((all_vars*)Vars_stack.items) + Vars_stack.count - 1;
 			if (!Vars_stack.count)
 				return False;
 			memcpy(&Vars, vp, sizeof Vars);
diff --git a/main.c b/main.c
@@ -272,7 +272,7 @@ static void become_copy_as_user()
 			exit_cleanup(RERR_SYNTAX);
 		}
 	} else {
-		struct passwd *pw;
+		const struct passwd *pw;
 		if ((pw = getpwuid(uid)) == NULL) {
 			rsyserr(FERROR, errno, "getpwuid failed");
 			exit_cleanup(RERR_SYNTAX);
@@ -925,7 +925,7 @@ static void read_final_goodbye(int f_in, int f_out)
 
 static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
 {
-	struct file_list *flist;
+	const struct file_list *flist;
 	char *dir;
 
 	if (DEBUG_GTE(SEND, 1))
@@ -1284,7 +1284,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
  * for rsyncd, remote-shell, and local connections. */
 int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 {
-	struct file_list *flist = NULL;
+	struct file_list *flist;
 	int exit_code = 0, exit_code2 = 0;
 	char *local_name = NULL;
 
diff --git a/options.c b/options.c
@@ -485,7 +485,8 @@ static void output_item_help(struct output_struct *words)
 {
 	short *levels = words == info_words ? info_levels : debug_levels;
 	const char *const*verbosity = words == info_words ? info_verbosity : debug_verbosity;
-	char buf[128], *opt, *fmt = "%-10s %s\n";
+	char buf[128], *opt;
+        static const char * const fmt = "%-10s %s\n";
 	int j;
 
 	reset_output_levels();
@@ -943,7 +944,8 @@ static void parse_one_refuse_match(int negated, const char *ref, const struct po
  **/
 static void set_refuse_options(void)
 {
-	struct poptOption *op, *list_end = NULL;
+	struct poptOption *op;
+        struct poptOption const *list_end = NULL;
 	char *cp, *ref = lp_refuse_options(module_id);
 	int negated;
 
@@ -2871,7 +2873,7 @@ void server_options(char **args, int *argc_p)
 		args[ac++] = "--ignore-missing-args";
 
 	if (modify_window_set && am_sender) {
-		char *fmt = modify_window < 0 ? "-@%d" : "--modify-window=%d";
+		const char *fmt = modify_window < 0 ? "-@%d" : "--modify-window=%d";
 		if (asprintf(&arg, fmt, modify_window) < 0)
 			goto oom;
 		args[ac++] = arg;
diff --git a/popt/lookup3.c b/popt/lookup3.c
@@ -796,7 +796,7 @@ static void driver1(void)
 static void driver2(void)
 {
     uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
-    uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
+    uint32_t c[HASHSTATE], d[HASHSTATE], i, j, k, l, m=0, z;
     uint32_t e[HASHSTATE],f[HASHSTATE],g[HASHSTATE],h[HASHSTATE];
     uint32_t x[HASHSTATE],y[HASHSTATE];
     uint32_t hlen;
@@ -867,7 +867,7 @@ static void driver3(void)
     uint32_t j;
     uint8_t qqqq[] = "xxxThis is the time for all good men to come to the aid of their country...";
     uint32_t ref,x,y;
-    uint8_t *p;
+    const uint8_t *p;
     uint32_t m = 13;
 
     printf("Endianness.  These lines should all be the same (for values filled in):\n");
diff --git a/popt/popt.c b/popt/popt.c
@@ -408,7 +408,8 @@ static int handleAlias(poptContext con,
 static
 const char * findProgramPath(const char * argv0)
 {
-    char *path = NULL, *s = NULL, *se;
+    char *path = NULL, *se;
+    const char *s = NULL;
     char *t = NULL;
 
     if (argv0 == NULL) return NULL;	/* XXX can't happen */
@@ -581,12 +582,12 @@ findOption(const struct poptOption * opt,
 	     && callbackData && *callbackData == NULL)
 		*callbackData = opt->descrip;
 	    return opt2;
-	}   break;
+	}   // break; // Already continues or returns
 	case POPT_ARG_CALLBACK:
 	    cb = opt;
 	    cbarg.ptr = opt->arg;
 	    continue;
-	    break;
+	    // break; // Already continues
 	default:
 	    break;
 	}
@@ -804,7 +805,7 @@ int poptBitsDel(poptBits bits, const char * s)
 int poptBitsIntersect(poptBits *ap, const poptBits b)
 {
     __pbm_bits *abits;
-    __pbm_bits *bbits;
+    const __pbm_bits *bbits;
     __pbm_bits rc = 0;
     size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
     size_t i;
@@ -824,7 +825,7 @@ int poptBitsIntersect(poptBits *ap, const poptBits b)
 int poptBitsUnion(poptBits *ap, const poptBits b)
 {
     __pbm_bits *abits;
-    __pbm_bits *bbits;
+    const __pbm_bits *bbits;
     __pbm_bits rc = 0;
     size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
     size_t i;
@@ -864,7 +865,8 @@ int poptSaveBits(poptBits * bitsp,
 		UNUSED(unsigned int argInfo), const char * s)
 {
     char *tbuf = NULL;
-    char *t, *te;
+    const char *t;
+    char *te;
     int rc = 0;
 
     if (bitsp == NULL || s == NULL || *s == '\0' || _poptBitsNew(bitsp))
diff --git a/popt/popthelp.c b/popt/popthelp.c
@@ -117,10 +117,11 @@ static size_t maxColumnWidth(FILE *fp)
  */
 static inline size_t stringDisplayWidth(const char *s)
 {
-    size_t n = strlen(s);
+    size_t n;
 #ifdef HAVE_MBSRTOWCS
     mbstate_t t;
 
+    n = strlen(s);
     memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
     /* Determine number of display characters.  */
     n = mbsrtowcs (NULL, &s, n, &t);
@@ -667,7 +668,6 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     if (!(prtshort || prtlong))
 	return columns->cur;
 
-    len = sizeof(" []")-1;
     if (prtshort)
 	len += sizeof("-c")-1;
     if (prtlong) {
diff --git a/popt/poptint.c b/popt/poptint.c
@@ -82,7 +82,7 @@ strdup_locale_from_utf8 (char * istr)
     if (codeset != NULL && strcmp(codeset, "UTF-8") != 0
      && (cd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
     {
-	char * shift_pin = NULL;
+	const char * shift_pin = NULL;
 	size_t db = strlen(istr);
 	char * dstr = malloc((db + 1) * sizeof(*dstr));
 	char * dstr_tmp;
@@ -122,7 +122,7 @@ strdup_locale_from_utf8 (char * istr)
 		pout = dstr + used;
 		ob = db - used;
 		continue;
-	    }   break;
+	    }   // break;  // Already has continue
 	    case EINVAL:
 	    case EILSEQ:
 	    default:
diff --git a/testrun.c b/testrun.c
@@ -8,7 +8,7 @@
  int main(int argc, char *argv[])
 {
 	pid_t pid;
-	char *timeout_env;
+	const char *timeout_env;
 	int status, timeout_secs, slept = 0;
 
 	if (argc < 2) {
diff --git a/usage.c b/usage.c
@@ -36,7 +36,7 @@ static char *istring(const char *fmt, int val)
 
 static void print_info_flags(enum logcode f)
 {
-	STRUCT_STAT *dumstat;
+	const STRUCT_STAT *dumstat;
 	BOOL as_json = f == FNONE ? 1 : 0; /* We use 1 == first attribute, 2 == need closing array */
 	char line_buf[75], item_buf[32];
 	int line_len, j;
@@ -164,7 +164,7 @@ static void print_info_flags(enum logcode f)
 	};
 
 	for (line_len = 0, j = 0; ; j++) {
-		char *str = info_flags[j], *next_nfo = str ? info_flags[j+1] : NULL;
+		const char *str = info_flags[j], *next_nfo = str ? info_flags[j+1] : NULL;
 		int need_comma = next_nfo && *next_nfo != '*' ? 1 : 0;
 		int item_len;
 		if (!str || *str == '*')
@@ -218,7 +218,8 @@ static void print_info_flags(enum logcode f)
 static void output_nno_list(enum logcode f, const char *name, struct name_num_obj *nno)
 {
 	char namebuf[64], tmpbuf[256];
-	char *tok, *next_tok, *comma = ",";
+	char *tok, *next_tok;
+	static const * const comma = ",";
 	char *cp;
 
 	/* Using '(' ensures that we get a trailing "none" but also includes aliases. */
diff --git a/util1.c b/util1.c
diff --git a/zlib/inffast.c b/zlib/inffast.c
diff --git a/zlib/inflate.c b/zlib/inflate.c

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ uint32 get_checksum1(char *buf1, int32 len)`
`286`	`286`	`{`
`287`	`287`	`int32 i;`
`288`	`288`	`uint32 s1, s2;`
`289`		`- schar buf = (schar )buf1;`
	`289`	`+ const schar buf = (schar )buf1;`
`290`	`290`
`291`	`291`	`s1 = s2 = 0;`
`292`	`292`	`for (i = 0; i < (len-4); i+=4) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`int main(UNUSED(int argc), UNUSED(char *argv[]))`
`24`	`24`	`{`
`25`	`25`	`int n, i;`
`26`		`- gid_t *list;`
	`26`	`+ const gid_t *list;`
`27`	`27`	`gid_t gid = MY_GID();`
`28`	`28`	`int gid_in_list = 0;`
`29`	`29`