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

Directly use fprintf() where applicable

Browse Source 
For some reasons, we were using snprintf() to format a string into a
buffer, and then displaying this buffer to stdout using fputs().

That's exactly what fprintf() is here for, so use it.

Signed-off-by: Baptiste Jonglez <baptiste--git@jonglez.org>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Baptiste Jonglez 2012-05-28 04:50:37 +02:00 committed by Lukas Fleischer
parent 4b58b0938f
commit 72995601e7
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/args.c
View File

@ -238,7 +238,6 @@ static void next_arg(void)
struct notify_app next_app; struct notify_app next_app;
const long current_time = now(); const long current_time = now();
int time_left, hours_left, min_left; int time_left, hours_left, min_left;
char mesg[BUFSIZ];
next_app.time = current_time + DAYINSEC; next_app.time = current_time + DAYINSEC;
next_app.got_app = 0; next_app.got_app = 0;
@ -252,9 +251,8 @@ static void next_arg(void)
hours_left = (time_left / HOURINSEC); hours_left = (time_left / HOURINSEC);
min_left = (time_left - hours_left * HOURINSEC) / MININSEC; min_left = (time_left - hours_left * HOURINSEC) / MININSEC;
fputs(_("next appointment:\n"), stdout); fputs(_("next appointment:\n"), stdout);
snprintf(mesg, BUFSIZ, " [%02d:%02d] %s\n", hours_left, min_left, fprintf(stdout, " [%02d:%02d] %s\n", hours_left, min_left,
next_app.txt); next_app.txt);
fputs(mesg, stdout);
mem_free(next_app.txt); mem_free(next_app.txt);
} }
} }
@ -480,12 +478,9 @@ date_arg(const char *ddate, int add_line, const char *fmt_apt,
(int *)&day.mm, (int *)&day.dd, NULL)) { (int *)&day.mm, (int *)&day.dd, NULL)) {
app_arg(add_line, &day, 0, fmt_apt, fmt_rapt, fmt_ev, fmt_rev, regex); app_arg(add_line, &day, 0, fmt_apt, fmt_rapt, fmt_ev, fmt_rev, regex);
} else { } else {
char outstr[BUFSIZ];
fputs(_("Argument to the '-d' flag is not valid\n"), stderr); fputs(_("Argument to the '-d' flag is not valid\n"), stderr);
snprintf(outstr, BUFSIZ, fprintf(stdout, _("Possible argument format are: '%s' or 'n'\n"),
_("Possible argument format are: '%s' or 'n'\n"),
DATEFMT_DESC(conf.input_datefmt)); DATEFMT_DESC(conf.input_datefmt));
fputs(outstr, stdout);
more_info(); more_info();
} }
} }
@ -536,12 +531,9 @@ date_arg_extended(const char *startday, const char *range, int add_line,
display_app(&t, numdays, add_line, fmt_apt, fmt_rapt, fmt_ev, fmt_rev, display_app(&t, numdays, add_line, fmt_apt, fmt_rapt, fmt_ev, fmt_rev,
regex); regex);
} else { } else {
char outstr[BUFSIZ];
fputs(_("Argument is not valid\n"), stderr); fputs(_("Argument is not valid\n"), stderr);
snprintf(outstr, BUFSIZ, fprintf(stdout, _("Argument format for -s and --startday is: '%s'\n"),
_("Argument format for -s and --startday is: '%s'\n"),
DATEFMT_DESC(conf.input_datefmt)); DATEFMT_DESC(conf.input_datefmt));
fputs(outstr, stdout);
fputs(_("Argument format for -r and --range is: 'n'\n"), stdout); fputs(_("Argument format for -r and --range is: 'n'\n"), stdout);
more_info(); more_info();
} }