Allows the compiler to check types.
format string functions expect constant expressions, not constant variables.
Signed-off-by: Rosen Penev rosenp@gmail.com --- axfer/xfer-options.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/axfer/xfer-options.c b/axfer/xfer-options.c index 3740b16..d4e5ff2 100644 --- a/axfer/xfer-options.c +++ b/axfer/xfer-options.c @@ -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); }