[src/trunk]: src/external/bsd/wpa/dist/wpa_supplicant Fix format strings to m...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0195bbd84d90
branches:  trunk
changeset: 333106:0195bbd84d90
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Oct 19 14:13:01 2014 +0000

description:
Fix format strings to match argument types.

diffstat:

 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c     |  5 +++--
 external/bsd/wpa/dist/wpa_supplicant/events.c         |  8 ++++----
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c |  8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r 0a089a21b2fa -r 0195bbd84d90 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c
--- a/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c Sun Oct 19 13:15:23 2014 +0000
+++ b/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c Sun Oct 19 14:13:01 2014 +0000
@@ -5814,9 +5814,10 @@
                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;
diff -r 0a089a21b2fa -r 0195bbd84d90 external/bsd/wpa/dist/wpa_supplicant/events.c
--- a/external/bsd/wpa/dist/wpa_supplicant/events.c     Sun Oct 19 13:15:23 2014 +0000
+++ b/external/bsd/wpa/dist/wpa_supplicant/events.c     Sun Oct 19 14:13:01 2014 +0000
@@ -2990,8 +2990,8 @@
 
                        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 @@
                        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;
diff -r 0a089a21b2fa -r 0195bbd84d90 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
--- a/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c     Sun Oct 19 13:15:23 2014 +0000
+++ b/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c     Sun Oct 19 14:13:01 2014 +0000
@@ -3405,8 +3405,8 @@
 
        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 @@
 
        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);