Module Name: src
Committed By: joerg
Date: Sun Oct 19 14:13:02 UTC 2014
Modified Files:
src/external/bsd/wpa/dist/wpa_supplicant: ctrl_iface.c events.c
wpa_supplicant.c
Log Message:
Fix format strings to match argument types.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/wpa/dist/wpa_supplicant/events.c \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.1.1.5 src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c:1.1.1.5 Thu Oct 16 19:16:02 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c Sun Oct 19 14:13:01 2014
@@ -5814,9 +5814,10 @@ static int wpas_ctrl_radio_work_show(str
int ret;
os_reltime_sub(&now, &work->time, &diff);
- ret = os_snprintf(pos, end - pos, "%s@%s:%u:%u:%ld.%06ld\n",
+ ret = os_snprintf(pos, end - pos, "%s@%s:%u:%u:%jd.%06ld\n",
work->type, work->wpa_s->ifname, work->freq,
- work->started, diff.sec, diff.usec);
+ work->started, (intmax_t)diff.sec,
+ (long)diff.usec);
if (ret < 0 || ret >= end - pos)
break;
pos += ret;
Index: src/external/bsd/wpa/dist/wpa_supplicant/events.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.1.1.6 src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.1.1.6 Thu Oct 16 19:16:03 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/events.c Sun Oct 19 14:13:01 2014
@@ -2990,8 +2990,8 @@ void wpa_supplicant_event(void *ctx, enu
os_reltime_sub(&wpa_s->scan_start_time,
&wpa_s->scan_trigger_time, &diff);
- wpa_dbg(wpa_s, MSG_DEBUG, "Own scan request started a scan in %ld.%06ld seconds",
- diff.sec, diff.usec);
+ wpa_dbg(wpa_s, MSG_DEBUG, "Own scan request started a scan in %jd.%06ld seconds",
+ (intmax_t)diff.sec, (long)diff.usec);
wpa_s->own_scan_requested = 0;
wpa_s->own_scan_running = 1;
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
@@ -3016,8 +3016,8 @@ void wpa_supplicant_event(void *ctx, enu
os_reltime_sub(&now, &wpa_s->scan_start_time, &diff);
wpa_s->scan_start_time.sec = 0;
wpa_s->scan_start_time.usec = 0;
- wpa_dbg(wpa_s, MSG_DEBUG, "Scan completed in %ld.%06ld seconds",
- diff.sec, diff.usec);
+ wpa_dbg(wpa_s, MSG_DEBUG, "Scan completed in %jd.%06ld seconds",
+ (intmax_t)diff.sec, (long)diff.usec);
}
wpa_supplicant_event_scan_results(wpa_s, data);
wpa_s->own_scan_running = 0;
Index: src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.1.1.6 src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.2
--- src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.1.1.6 Thu Oct 16 19:16:02 2014
+++ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c Sun Oct 19 14:13:01 2014
@@ -3405,8 +3405,8 @@ static void radio_start_next_work(void *
os_get_reltime(&now);
os_reltime_sub(&now, &work->time, &diff);
- wpa_dbg(work->wpa_s, MSG_DEBUG, "Starting radio work '%s'@%p after %ld.%06ld second wait",
- work->type, work, diff.sec, diff.usec);
+ wpa_dbg(work->wpa_s, MSG_DEBUG, "Starting radio work '%s'@%p after %jd.%06ld second wait",
+ work->type, work, (intmax_t)diff.sec, (long)diff.usec);
work->started = 1;
work->time = now;
work->cb(work, 0);
@@ -3555,9 +3555,9 @@ void radio_work_done(struct wpa_radio_wo
os_get_reltime(&now);
os_reltime_sub(&now, &work->time, &diff);
- wpa_dbg(wpa_s, MSG_DEBUG, "Radio work '%s'@%p %s in %ld.%06ld seconds",
+ wpa_dbg(wpa_s, MSG_DEBUG, "Radio work '%s'@%p %s in %jd.%06ld seconds",
work->type, work, started ? "done" : "canceled",
- diff.sec, diff.usec);
+ (intmax_t)diff.sec, (long)diff.usec);
radio_work_free(work);
if (started)
radio_work_check_next(wpa_s);
