diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 23:32:29 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 23:32:29 +0200 |
| commit | 38d4a182b7ccc4a683c1f9bcbe1da7779cc14832 (patch) | |
| tree | 974665e1baf08a8ad70f2fbad970102bd1e7a8c8 /util/igetevent.c | |
| parent | 69786de63e325b2f4d9f1afc49b30dcf091b5220 (diff) | |
| parent | 55adddbc16f65732b57ab8585c47001fced91d77 (diff) | |
Merge tag 'upstream/2.9.9'
Upstream version 2.9.9
Diffstat (limited to 'util/igetevent.c')
| -rw-r--r-- | util/igetevent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/igetevent.c b/util/igetevent.c index 9d1786c..1c420e2 100644 --- a/util/igetevent.c +++ b/util/igetevent.c @@ -169,7 +169,7 @@ extern void free_sdr_cache(uchar *pret); /*see isensor.c*/ * Global variables */ static char * progname = "igetevent"; -static char * progver = "2.98"; +static char * progver = "2.99"; static char fdebug = 0; static char fipmilan = 0; static char frunonce = 0; @@ -757,7 +757,7 @@ static int startevent_sel(ushort *precid, uint *ptime) if (fdebug) msgout("start: idxfile=%s fd=%p\n",idxfile,fd); if (fd != NULL) { // Read the file, get savtime & savid - rv = fscanf(fd,"%x %x",&t,&r); + rv = fscanf(fd,"%x %x",&t,(uint *)&r); fclose(fd); if (r == LAST_REC) r = 0; rv = 0; /*read it, success*/ |