From: Bruno Haible Date: Tue, 9 Dec 2025 23:09:28 +0000 (+0100) Subject: Remove unnecessary variable initializations. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe01cb91c5ac7beaefdc83b87a8abeddcfe8203c;p=thirdparty%2Fgnulib.git Remove unnecessary variable initializations. * lib/argp-parse.c (parser_parse_next): Don't initialize err. * lib/argz.c (argz_create_sep): Don't assign *len unnecessarily. * lib/bitset/table.c (tbitset_op3_cmp): Don't initialize j. * lib/canonicalize.c (canonicalize_filename_mode_stk): Don't initialize prefix_len unnecessarily. * lib/canonicalize-lgpl.c (realpath_stk): Likewise. * lib/javacomp.c (get_compiler_version): Don't initialize version_start. * lib/parse-duration.c (parse_time): Don't initialize res. * lib/read-file.c (fread_file): Don't initialize buf. * lib/tempname.c (try_tempname_len): Don't initialize fd. --- diff --git a/ChangeLog b/ChangeLog index 2a9fa9aaa9..f5097cb454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2025-12-09 Bruno Haible + + Remove unnecessary variable initializations. + * lib/argp-parse.c (parser_parse_next): Don't initialize err. + * lib/argz.c (argz_create_sep): Don't assign *len unnecessarily. + * lib/bitset/table.c (tbitset_op3_cmp): Don't initialize j. + * lib/canonicalize.c (canonicalize_filename_mode_stk): Don't initialize + prefix_len unnecessarily. + * lib/canonicalize-lgpl.c (realpath_stk): Likewise. + * lib/javacomp.c (get_compiler_version): Don't initialize version_start. + * lib/parse-duration.c (parse_time): Don't initialize res. + * lib/read-file.c (fread_file): Don't initialize buf. + * lib/tempname.c (try_tempname_len): Don't initialize fd. + 2025-12-09 Bruno Haible pipe-filter-ii: Avoid some 'goto' statements. diff --git a/lib/argp-parse.c b/lib/argp-parse.c index 265dafa2d5..c5597a08f6 100644 --- a/lib/argp-parse.c +++ b/lib/argp-parse.c @@ -781,7 +781,7 @@ static error_t parser_parse_next (struct parser *parser, int *arg_ebadkey) { int opt; - error_t err = 0; + error_t err; if (parser->state.quoted && parser->state.next < parser->state.quoted) /* The next argument pointer has been moved to before the quoted diff --git a/lib/argz.c b/lib/argz.c index 9b983b717d..1262ab4bb7 100644 --- a/lib/argz.c +++ b/lib/argz.c @@ -120,7 +120,6 @@ argz_create_sep (const char *string, int delim, char **argz, size_t *len) { free (*argz); *argz = NULL; - *len = 0; } *len = nlen; diff --git a/lib/bitset/table.c b/lib/bitset/table.c index da6b304865..710a60f3d4 100644 --- a/lib/bitset/table.c +++ b/lib/bitset/table.c @@ -884,7 +884,7 @@ tbitset_op3_cmp (bitset dst, bitset src1, bitset src2, enum bitset_ops op) tbitset_elts *selts2 = TBITSET_ELTS (src2); tbitset_elts *delts = TBITSET_ELTS (dst); - bitset_windex j = 0; + bitset_windex j; for (j = 0; j < size; j++) { tbitset_elt *selt1 = j < ssize1 ? selts1[j] : NULL; diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 7aea4aaba6..be5519da58 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -220,7 +220,7 @@ realpath_stk (const char *name, char *resolved, struct realpath_bufs *bufs) /* This is always zero for Posix hosts, but can be 2 for MS-Windows and MS-DOS X:/foo/bar file names. */ - idx_t prefix_len = FILE_SYSTEM_PREFIX_LEN (name); + idx_t prefix_len; if (!IS_ABSOLUTE_FILE_NAME (name)) { @@ -241,6 +241,7 @@ realpath_stk (const char *name, char *resolved, struct realpath_bufs *bufs) } else { + prefix_len = FILE_SYSTEM_PREFIX_LEN (name); dest = __mempcpy (rname, name, prefix_len); *dest++ = '/'; if (DOUBLE_SLASH_IS_DISTINCT_ROOT) diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 10d85efb1a..a8eadfb856 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -212,7 +212,7 @@ canonicalize_filename_mode_stk (const char *name, canonicalize_mode_t can_mode, /* This is always zero for Posix hosts, but can be 2 for MS-Windows and MS-DOS X:/foo/bar file names. */ - idx_t prefix_len = FILE_SYSTEM_PREFIX_LEN (name); + idx_t prefix_len; if (!IS_ABSOLUTE_FILE_NAME (name)) { @@ -239,6 +239,7 @@ canonicalize_filename_mode_stk (const char *name, canonicalize_mode_t can_mode, } else { + prefix_len = FILE_SYSTEM_PREFIX_LEN (name); dest = mempcpy (rname, name, prefix_len); *dest++ = '/'; if (DOUBLE_SLASH_IS_DISTINCT_ROOT) diff --git a/lib/javacomp.c b/lib/javacomp.c index e56878e8df..e43aa67dfc 100644 --- a/lib/javacomp.c +++ b/lib/javacomp.c @@ -391,7 +391,7 @@ get_compiler_version (const char *progname, return 0; /* Search the first digit in line. */ - char *version_start = line; + char *version_start; for (version_start = line; ; version_start++) { if (*version_start == '\0') diff --git a/lib/parse-duration.c b/lib/parse-duration.c index 1fe3f845b3..7b750da824 100644 --- a/lib/parse-duration.c +++ b/lib/parse-duration.c @@ -369,7 +369,7 @@ static time_t parse_time (cch_t * pz) { cch_t * ps; - time_t res = 0; + time_t res; /* * Scan for a hyphen diff --git a/lib/read-file.c b/lib/read-file.c index f6c02dae56..1c06dd73ef 100644 --- a/lib/read-file.c +++ b/lib/read-file.c @@ -51,7 +51,7 @@ char * fread_file (FILE *stream, int flags, size_t *length) { - char *buf = NULL; + char *buf; size_t alloc = BUFSIZ; /* For a regular file, allocate a buffer that has exactly the right diff --git a/lib/tempname.c b/lib/tempname.c index cd16daf333..30a681033c 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -191,7 +191,7 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, { size_t len; char *XXXXXX; - int fd = -1; + int fd; int saved_errno = errno; /* A lower bound on the number of temporary files to attempt to