summaryrefslogtreecommitdiffhomepage
path: root/dbutil.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2014-07-28 22:59:16 +0800
committerMatt Johnston <matt@ucc.asn.au>2014-07-28 22:59:16 +0800
commit393ca2a290b70c715cd432309304771e075e2418 (patch)
treec8e54867566b98c0f22bac9f675306adef9bf956 /dbutil.c
parentad1d48e07b7f846fd584c23d3eb15aa44d30a1ad (diff)
Fix some format string warnings
Diffstat (limited to 'dbutil.c')
-rw-r--r--dbutil.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/dbutil.c b/dbutil.c
index 5826729..a5616ac 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -161,7 +161,7 @@ void dropbear_trace(const char* format, ...) {
gettimeofday(&tv, NULL);
va_start(param, format);
- fprintf(stderr, "TRACE (%d) %d.%d: ", getpid(), tv.tv_sec, tv.tv_usec);
+ fprintf(stderr, "TRACE (%d) %d.%d: ", getpid(), (int)tv.tv_sec, (int)tv.tv_usec);
vfprintf(stderr, format, param);
fprintf(stderr, "\n");
va_end(param);
@@ -183,7 +183,7 @@ void dropbear_trace2(const char* format, ...) {
gettimeofday(&tv, NULL);
va_start(param, format);
- fprintf(stderr, "TRACE2 (%d) %d.%d: ", getpid(), tv.tv_sec, tv.tv_usec);
+ fprintf(stderr, "TRACE2 (%d) %d.%d: ", getpid(), (int)tv.tv_sec, (int)tv.tv_usec);
vfprintf(stderr, format, param);
fprintf(stderr, "\n");
va_end(param);
@@ -956,6 +956,7 @@ static clockid_t get_linux_clock_source() {
if (syscall(SYS_clock_gettime, CLOCK_MONOTONIC_COARSE, &ts) == 0) {
return CLOCK_MONOTONIC_COARSE;
}
+
if (syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &ts) == 0) {
return CLOCK_MONOTONIC;
}
@@ -968,7 +969,7 @@ time_t monotonic_now() {
static clockid_t clock_source = -2;
if (clock_source == -2) {
- /* First time, find out which one works.
+ /* First run, find out which one works.
-1 will fall back to time() */
clock_source = get_linux_clock_source();
}