Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix printf with 64bit time_t #229

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix printf with 64bit time_t #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,9 @@ This is a complete example program, similar to `ts_print_mt.c`:
continue;
#endif

printf("%ld.%06ld: (slot %d) %6d %6d %6d\n",
samp_mt[j][i].tv.tv_sec,
samp_mt[j][i].tv.tv_usec,
printf("%lld.%06lld: (slot %d) %6d %6d %6d\n",
(long long)samp_mt[j][i].tv.tv_sec,
(long long)samp_mt[j][i].tv.tv_usec,
samp_mt[j][i].slot,
samp_mt[j][i].x,
samp_mt[j][i].y,
Expand Down
14 changes: 7 additions & 7 deletions plugins/input-evdev-raw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,11 +461,11 @@ static int ts_input_read(struct tslib_module_info *inf,
samp->tv = ev.time;
#ifdef DEBUG
fprintf(stderr,
"RAW nr %d ---------------------> %d %d %d %ld.%ld\n",
"RAW nr %d ---------------------> %d %d %d %lld.%06lld\n",
total,
samp->x, samp->y, samp->pressure,
(long)samp->tv.tv_sec,
(long)samp->tv.tv_usec);
(long long)samp->tv.tv_sec,
(long long)samp->tv.tv_usec);
#endif /* DEBUG */
samp++;
total++;
Expand Down Expand Up @@ -651,11 +651,11 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
}

#ifdef DEBUG
printf("INPUT-RAW nr %d: read type %d code %3d value %4d time %ld.%ld\n",
printf("INPUT-RAW nr %d: read type %d code %3d value %4d time %lld.%06lld\n",
total,
ev.type, ev.code,
ev.value, (long)ev.time.tv_sec,
(long)ev.time.tv_usec);
ev.type, ev.code, ev.value,
(long long)ev.time.tv_sec,
(long long)ev.time.tv_usec);
#endif
switch (ev.type) {
case EV_KEY:
Expand Down
12 changes: 6 additions & 6 deletions plugins/input-raw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ static int ts_input_read(struct tslib_module_info *inf,
samp->tv.tv_usec = ev.input_event_usec;
#ifdef DEBUG
fprintf(stderr,
"RAW---------------------> %d %d %d %ld.%ld\n",
"RAW---------------------> %d %d %d %lld.%06lld\n",
samp->x, samp->y, samp->pressure,
(long)samp->tv.tv_sec,
(long)samp->tv.tv_usec);
(long long)samp->tv.tv_sec,
(long long)samp->tv.tv_usec);
#endif /* DEBUG */
samp++;
total++;
Expand Down Expand Up @@ -648,10 +648,10 @@ static int ts_input_read_mt(struct tslib_module_info *inf,

for (it = 0; it < rd / sizeof(struct input_event); it++) {
#ifdef DEBUG
printf("INPUT-RAW: read type %d code %3d value %4d time %ld.%ld\n",
printf("INPUT-RAW: read type %d code %3d value %4d time %lld.%06lld\n",
i->ev[it].type, i->ev[it].code,
i->ev[it].value, (long)i->ev[it].input_event_sec,
(long)i->ev[it].input_event_usec);
i->ev[it].value, (long long)i->ev[it].input_event_sec,
(long long)i->ev[it].input_event_usec);
#endif
switch (i->ev[it].type) {
case EV_KEY:
Expand Down
2 changes: 1 addition & 1 deletion tests/ts_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ int main(int argc, char **argv)
if (ret != 1)
continue;

printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec, samp.x, samp.y, samp.pressure);
printf("%lld.%06lld: %6d %6d %6d\n", (long long)samp.tv.tv_sec, (long long)samp.tv.tv_usec, samp.x, samp.y, samp.pressure);

}

Expand Down
6 changes: 3 additions & 3 deletions tests/ts_print_mt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ int main(int argc, char **argv)
if (!(samp_mt[j][i].valid & TSLIB_MT_VALID))
continue;

printf(YELLOW "sample %d - %ld.%06ld -" RESET " (slot %d) %6d %6d %6d\n",
printf(YELLOW "sample %d - %lld.%06lld -" RESET " (slot %d) %6d %6d %6d\n",
j,
samp_mt[j][i].tv.tv_sec,
samp_mt[j][i].tv.tv_usec,
(long long)samp_mt[j][i].tv.tv_sec,
(long long)samp_mt[j][i].tv.tv_usec,
samp_mt[j][i].slot,
samp_mt[j][i].x,
samp_mt[j][i].y,
Expand Down
2 changes: 1 addition & 1 deletion tests/ts_print_raw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int main(int argc, char **argv)
if (ret != 1)
continue;

printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec, samp.x, samp.y, samp.pressure);
printf("%lld.%06lld: %6d %6d %6d\n", (long long)samp.tv.tv_sec, (long long)samp.tv.tv_usec, samp.x, samp.y, samp.pressure);

}

Expand Down
2 changes: 1 addition & 1 deletion tests/ts_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ int main(int argc, char **argv)
quit_pressed = 1;
}

printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec,
printf("%lld.%06lld: %6d %6d %6d\n", (long long)samp.tv.tv_sec, (long long)samp.tv.tv_usec,
samp.x, samp.y, samp.pressure);

if (samp.pressure > 0) {
Expand Down
6 changes: 3 additions & 3 deletions tests/ts_test_mt_sdl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ int main(int argc, char **argv)
samp_mt[0][i].x, samp_mt[0][i].y);

if (verbose) {
printf("%ld.%06ld: (slot %d) %6d %6d %6d\n",
samp_mt[0][i].tv.tv_sec,
samp_mt[0][i].tv.tv_usec,
printf("%lld.%06lld: (slot %d) %6d %6d %6d\n",
(long long)samp_mt[0][i].tv.tv_sec,
(long long)samp_mt[0][i].tv.tv_usec,
samp_mt[0][i].slot,
samp_mt[0][i].x,
samp_mt[0][i].y,
Expand Down