monitor: fix printf format strings

time_t is 64 bit (long long) on many 32 bit platforms (e.g. ARM) now

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/monitor/analyze.c b/monitor/analyze.c
index 135dc91..4f0ebb2 100755 (executable)
--- a/monitor/analyze.c
+++ b/monitor/analyze.c
@@ -174,15 +174,18 @@ static void conn_destroy(void *data)
        print_field("%lu RX packets", conn->rx_num);
        print_field("%lu TX packets", conn->tx_num);
        print_field("%lu TX completed packets", conn->tx_num_comp);
-       print_field("%ld msec min latency",
-                       conn->tx_lat_min.tv_sec * 1000 +
-                       conn->tx_lat_min.tv_usec / 1000);
-       print_field("%ld msec max latency",
-                       conn->tx_lat_max.tv_sec * 1000 +
-                       conn->tx_lat_max.tv_usec / 1000);
-       print_field("%ld msec median latency",
-                       conn->tx_lat_med.tv_sec * 1000 +
-                       conn->tx_lat_med.tv_usec / 1000);
+       print_field("%lld msec min latency",
+                       (long long)
+                       (conn->tx_lat_min.tv_sec * 1000 +
+                       conn->tx_lat_min.tv_usec / 1000));
+       print_field("%lld msec max latency",
+                       (long long)
+                       (conn->tx_lat_max.tv_sec * 1000 +
+                       conn->tx_lat_max.tv_usec / 1000));
+       print_field("%lld msec median latency",
+                       (long long)
+                       (conn->tx_lat_med.tv_sec * 1000 +
+                       conn->tx_lat_med.tv_usec / 1000));
        print_field("%u octets TX min packet size", conn->tx_pkt_min);
        print_field("%u octets TX max packet size", conn->tx_pkt_max);
        print_field("%u octets TX median packet size", conn->tx_pkt_med);

diff --git a/monitor/packet.c b/monitor/packet.c
index df6e2d7..afbc010 100755 (executable)
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -383,8 +383,9 @@ static void print_packet(struct timeval *tv, struct ucred *cred, char ident,
                }
 
                if (filter_mask & PACKET_FILTER_SHOW_TIME) {
-                       n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06lu",
-                               tm.tm_hour, tm.tm_min, tm.tm_sec, tv->tv_usec);
+                       n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06llu",
+                               tm.tm_hour, tm.tm_min, tm.tm_sec,
+                               (long long)tv->tv_usec);
                        if (n > 0) {
                                ts_pos += n;
                                ts_len += n;
@@ -392,8 +393,9 @@ static void print_packet(struct timeval *tv, struct ucred *cred, char ident,
                }
 
                if (filter_mask & PACKET_FILTER_SHOW_TIME_OFFSET) {
-                       n = sprintf(ts_str + ts_pos, " %lu.%06lu",
-                                       tv->tv_sec - time_offset, tv->tv_usec);
+                       n = sprintf(ts_str + ts_pos, " %llu.%06llu",
+                               (long long)(tv->tv_sec - time_offset),
+                               (long long)tv->tv_usec);
                        if (n > 0) {
                                ts_pos += n;
                                ts_len += n;