From c7572f2e586c7b2aa1e7330099f00420f605b072 Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Fri, 15 May 2026 11:29:50 +0200 Subject: [PATCH] MT#61856 main: prevent duplicated usage of `F` shortcut Already used by `--no-fallback`, so the rest just probably inherited the same letter when doing copy-paste. That is ambiguous and may cause option parsing conflicts. Keep `F` only for the historical(most important) option and set the rest to 0. Change-Id: I6e4841f6e6614bfdfcf53d159130d6d676073d47 (cherry picked from commit b659b2371f731fbf54a7be4443b872a1d1d745a8) (cherry picked from commit 807bc216dee522b581a79cf540f6d4c55743bd5d) --- daemon/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/main.c b/daemon/main.c index c298834fd..afbbc6063 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -793,7 +793,7 @@ static void options(int *argc, char ***argv, charp_ht templates) { { "priority", 0, 0, G_OPTION_ARG_INT, &rtpe_config.priority, "Thread scheduling priority", "INT" }, { "idle-scheduling",0, 0,G_OPTION_ARG_STRING, &rtpe_config.idle_scheduling,"Idle thread scheduling policy", "default|none|fifo|rr|other|batch|idle" }, { "idle-priority",0, 0, G_OPTION_ARG_INT, &rtpe_config.idle_priority,"Idle thread scheduling priority", "INT" }, - { "log-srtp-keys",'F', 0, G_OPTION_ARG_NONE, &rtpe_config.log_keys, "Log SRTP keys to error log", NULL }, + { "log-srtp-keys",0, 0, G_OPTION_ARG_NONE, &rtpe_config.log_keys, "Log SRTP keys to error log", NULL }, { "mysql-host", 0, 0, G_OPTION_ARG_STRING, &rtpe_config.mysql_host,"MySQL host for stored media files","HOST|IP" }, { "mysql-port", 0, 0, G_OPTION_ARG_INT, &rtpe_config.mysql_port,"MySQL port" ,"INT" }, { "mysql-user", 0, 0, G_OPTION_ARG_STRING, &rtpe_config.mysql_user,"MySQL connection credentials", "USERNAME" }, @@ -880,7 +880,7 @@ static void options(int *argc, char ***argv, charp_ht templates) { { "moh-max-duration", 0,0, G_OPTION_ARG_INT, &rtpe_config.moh_max_duration, "Max possible duration (in milliseconds) that can be spent on playing a file. If set to 0 then will be ignored.", "INT"}, { "moh-max-repeats", 0,0, G_OPTION_ARG_INT, &rtpe_config.moh_max_repeats, "Max possible amount of playback repeats for the music on hold. player-max-duration always takes a precedence over it.", "INT"}, { "moh-attr-name", 0,0, G_OPTION_ARG_STRING, &rtpe_config.moh_attr_name, "Controls the value to be added to the session level of SDP whenever MoH is triggered.", "STRING"}, - { "moh-prevent-double-hold", 'F',0, G_OPTION_ARG_NONE, &rtpe_config.moh_prevent_double_hold, "Protects against double MoH played.", NULL}, + { "moh-prevent-double-hold", 0,0, G_OPTION_ARG_NONE, &rtpe_config.moh_prevent_double_hold, "Protects against double MoH played.", NULL}, { "max-recv-iters", 0, 0, G_OPTION_ARG_INT, &rtpe_config.max_recv_iters, "Maximum continuous reading cycles in UDP poller loop.", "INT"}, { "vsc-start-rec",0,0, G_OPTION_ARG_STRING, &rtpe_config.vsc_start_rec.s,"DTMF VSC to start recording.", "STRING"}, { "vsc-stop-rec",0,0, G_OPTION_ARG_STRING, &rtpe_config.vsc_stop_rec.s,"DTMF VSC to stop recording.", "STRING"},