aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-02-19 03:14:31 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2012-02-19 03:14:31 +0100
commit2bc4deacdc634d80cf555dabea05fc16026b6bc4 (patch)
treee474c8349b2037ed56ccfa5ca87d77eac2320f45
parent2702a61b0e22ddcbd0b23c1765fac90fe766802a (diff)
downloadcalcurse-2bc4deacdc634d80cf555dabea05fc16026b6bc4.tar.gz
calcurse-2bc4deacdc634d80cf555dabea05fc16026b6bc4.zip
Fix up fscanf() format strings
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>
-rw-r--r--src/io.c6
-rw-r--r--src/recur.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/io.c b/src/io.c
index 418feea..c7401e4 100644
--- a/src/io.c
+++ b/src/io.c
@@ -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);
diff --git a/src/recur.c b/src/recur.c
index 79046f8..5fb30b9 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -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"));