fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify code in status_ask_choice()

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-02-24 14:02:31 +01:00
parent 0145ba12ec
commit 8c82fc3f6d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils.c
View File

@ -197,19 +197,17 @@ void status_mesg(const char *msg1, const char *msg2)
int status_ask_choice(const char *message, const char choice[], int status_ask_choice(const char *message, const char choice[],
int nb_choice) int nb_choice)
{ {
int i, ch;
char *tmp;
/* "[4/2/f/t/w/.../Z] " */ /* "[4/2/f/t/w/.../Z] " */
char avail_choice[2 * nb_choice + 3]; char avail_choice[2 * nb_choice + 3];
int i, ch;
avail_choice[0] = '['; avail_choice[0] = '[';
avail_choice[1] = '\0';
for (i = 1; i <= nb_choice; i++) { for (i = 1; i <= nb_choice; i++) {
asprintf(&tmp, (i == nb_choice) ? "%c] " : "%c/", choice[i]); avail_choice[i * 2 - 1] = choice[i];
strcat(avail_choice, tmp); avail_choice[i * 2] = '/';
mem_free(tmp);
} }
avail_choice[nb_choice * 2] = ']';
avail_choice[nb_choice * 2 + 1] = '\0';
status_mesg(message, avail_choice); status_mesg(message, avail_choice);