Various fixes.
Use snprintf(3) instead of sprintf(3) and fix a missing i18n tag. Signed-off-by: Baptiste Jonglez <baptiste--git@jonglez.org> Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
parent
13d6f8703b
commit
b17475128d
@ -742,7 +742,7 @@ update_rept (struct rpt **rpt, const long start)
|
|||||||
const char *msg_wrong_time = _("Invalid time: start time must be before end time!");
|
const char *msg_wrong_time = _("Invalid time: start time must be before end time!");
|
||||||
const char *msg_wrong_date = _("The entered date is not valid.");
|
const char *msg_wrong_date = _("The entered date is not valid.");
|
||||||
const char *msg_fmts =
|
const char *msg_fmts =
|
||||||
"Possible formats are [%s] or '0' for an endless repetetition";
|
_("Possible formats are [%s] or '0' for an endless repetetition");
|
||||||
const char *msg_enter = _("Press [Enter] to continue");
|
const char *msg_enter = _("Press [Enter] to continue");
|
||||||
|
|
||||||
switch (status_ask_choice (msg_rpt_asktype, msg_rpt_choice, 4))
|
switch (status_ask_choice (msg_rpt_asktype, msg_rpt_choice, 4))
|
||||||
|
@ -208,7 +208,7 @@ status_ask_choice(const char *message, const char choice[], int nb_choice)
|
|||||||
|
|
||||||
for (i = 1; i <= nb_choice; i++)
|
for (i = 1; i <= nb_choice; i++)
|
||||||
{
|
{
|
||||||
sprintf (tmp, (i == nb_choice) ? "%c] " : "%c/", choice[i]);
|
snprintf (tmp, BUFSIZ, (i == nb_choice) ? "%c] " : "%c/", choice[i]);
|
||||||
strcat (avail_choice, tmp);
|
strcat (avail_choice, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +262,7 @@ status_ask_simplechoice (const char *prefix, const char *choice[],
|
|||||||
|
|
||||||
for (i = 0; i < nb_choice; i++)
|
for (i = 0; i < nb_choice; i++)
|
||||||
{
|
{
|
||||||
sprintf (tmp, ((i + 1) == nb_choice) ? "(%d) %s?" : "(%d) %s, ",
|
snprintf (tmp, BUFSIZ, ((i + 1) == nb_choice) ? "(%d) %s?" : "(%d) %s, ",
|
||||||
(i + 1), _(choice[i]));
|
(i + 1), _(choice[i]));
|
||||||
strcat (choicestr, tmp);
|
strcat (choicestr, tmp);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user