xfer-opitons: Fix -Wformat=2 warnings
PATCH 1/1 xfer-opitons: Fix -Wformat=2 warnings
Allows the compiler to check types.
format string functions expect constant expressions, not constant variables.
--- axfer/xfer-options.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
axfer/xfer-options.c +4 -8
@@ -422,8 +422,6 @@ static int generate_path_with_suffix(struct xfer_context *xfer, const char *template, unsigned int index, const char *suffix) { - static const char *const single_format = "%s%s"; -static const char *const multiple_format ="%s-%i%s" ; unsigned int len; len =strlen (template) +strlen (suffix) +1 ;
@@ -435,10 +433,10 @@ static int generate_path_with_suffix(struct xfer_context *xfer,return -ENOMEM ;if (xfer->path_count ==1 ) { -snprintf (xfer->paths[index], len, single_format, template, +snprintf (xfer->paths[index], len,"%s%s" , template, suffix); }else { -snprintf (xfer->paths[index], len, multiple_format, template, +snprintf (xfer->paths[index], len,"%s-%i%s" , template, index, suffix); }
@@ -449,8 +447,6 @@ static int generate_path_without_suffix(struct xfer_context *xfer,const char *template, unsigned int index, const char *suffix) { - static const char *const single_format = "%s"; -static const char *const multiple_format ="%s-%i" ; unsigned int len; len =strlen (template) +1 ;
@@ -462,9 +458,9 @@ static int generate_path_without_suffix(struct xfer_context *xfer,return -ENOMEM ;if (xfer->path_count ==1 ) { -snprintf (xfer->paths[index], len, single_format, template); +snprintf (xfer->paths[index], len,"%s" , template); }else { -snprintf (xfer->paths[index], len, multiple_format, template, +snprintf (xfer->paths[index], len,"%s-%i" , template, index); }
Signature · 6 lines
2.24.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 9 lines · Rosen Penev
Allows the compiler to check types.
format string functions expect constant expressions, not constant variables.
Signed-off-by Rosen Penev <[email protected]>--- axfer/xfer-options.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
According to reference manual of GCC[1], '-Wformat=2' is a easy helper to enable below options:
* -Wformat
* -Wformat-nonliteral
* -Wformat-security
* -Wformat-y2k
Your fix suppresses the warning from '-Wformat-nonliteral'. I'd like maintainers to revise the title of patch.
[1] https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
Regards
Takashi Sakamoto
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel