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

Fix up fscanf() format strings

Browse Source 
All members of the tm structure are signed integers. Stick to using the
correct fscanf() format specifiers for these.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-02-19 03:14:31 +01:00
parent 2702a61b0e
commit 2bc4deacdc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/io.c
View File

@ -499,7 +499,7 @@ io_load_app (void)
/* Read the date first: it is common to both events
* and appointments.
*/
if (fscanf (data_file, "%u / %u / %u ",
if (fscanf (data_file, "%d / %d / %d ",
&start.tm_mon, &start.tm_mday, &start.tm_year) != 3)
EXIT (_("syntax error in the item date"));
@ -518,7 +518,7 @@ io_load_app (void)
/* Read the remaining informations. */
if (is_appointment)
{
if (fscanf (data_file, " %u : %u -> %u / %u / %u @ %u : %u ",
if (fscanf (data_file, " %d : %d -> %d / %d / %d @ %d : %d ",
&start.tm_hour, &start.tm_min,
&end.tm_mon, &end.tm_mday, &end.tm_year,
&end.tm_hour, &end.tm_min) != 7)
@ -555,7 +555,7 @@ io_load_app (void)
}
else if (c == '-' && getc (data_file) == '>')
{
if (fscanf (data_file, " %u / %u / %u ", &until.tm_mon,
if (fscanf (data_file, " %d / %d / %d ", &until.tm_mon,
&until.tm_mday, &until.tm_year) != 3)
EXIT (_("syntax error in item repetition"));
c = getc (data_file);

2
src/recur.c
View File

@ -1019,7 +1019,7 @@ recur_exc_scan (llist_t *lexc, FILE *data_file)
while ((c = getc (data_file)) == '!')
{
ungetc (c, data_file);
if (fscanf (data_file, "!%u / %u / %u ",
if (fscanf (data_file, "!%d / %d / %d ",
&day.tm_mon, &day.tm_mday, &day.tm_year) != 3)
{
EXIT (_("syntax error in item date"));