From 75654b1a42daafbf74b46bc49ffdb141c77a4d77 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 16 May 2022 21:08:05 +0200 Subject: [PATCH] server: Remove compatibility code of com_ff(). The old syntax "ff 30-" is undocumented and deprecated since four years thanks to commit 9d232e63. According to the comment, the removal of the feature was scheduled for 0.7.0 but as of 0.7.1 the syntax is still accepted. So remove the extra code now. --- command.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/command.c b/command.c index 00d2c5a6..0c257b35 100644 --- a/command.c +++ b/command.c @@ -705,7 +705,7 @@ static int com_ff(struct command_context *cc, struct lls_parse_result *lpr) { long promille; int i, ret; - char c, *errctx; + char *errctx; ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx)); if (ret < 0) { @@ -713,21 +713,8 @@ static int com_ff(struct command_context *cc, struct lls_parse_result *lpr) return ret; } ret = para_atoi32(lls_input(0, lpr), &i); - if (ret < 0) { - if (ret != -E_ATOI_JUNK_AT_END) - return ret; - /* - * Compatibility code to keep the historic syntax (ff 30-) - * working. This can be removed after 0.7.0. - */ - ret = sscanf(lls_input(0, lpr), "%i%c", &i, &c); - if (ret <= 0) - return -E_COMMAND_SYNTAX; - if (ret > 1 && c == '-') { - PARA_WARNING_LOG("use of obsolete syntax\n"); - i = -i; - } - } + if (ret < 0) + return ret; mutex_lock(mmd_mutex); ret = -E_NO_AUDIO_FILE; if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total) -- 2.39.2