]> granicus.if.org Git - strace/commitdiff
Cast to long for %l in printf
authorH.J. Lu <hongjiu.lu@intel.com>
Fri, 3 Feb 2012 18:16:03 +0000 (10:16 -0800)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 6 Feb 2012 13:33:54 +0000 (13:33 +0000)
Cast a value to long for %l in printf to avoid compiler warning
on systems where it may be long long.

* count.c (call_summary_pers): Cast to long.
* ipc.c (sys_mq_open, printmqattr): Likewise.
* quota.c (decode_cmd_data): Likewise.
* resource.c (sys_sysinfo): Likewise.
* time.c (tprint_timex): Likewise.

count.c
ipc.c
quota.c
resource.c
time.c

diff --git a/count.c b/count.c
index 1785242ac335cfc995f0836a7bd229f640643d30..e2a0e762fbf140b6733c1ad29875a1d4b1b0c496 100644 (file)
--- a/count.c
+++ b/count.c
@@ -193,7 +193,7 @@ call_summary_pers(FILE *outf)
                                   / tv_float(&tv_cum));
                        fprintf(outf, "%6.2f %11.6f %11ld %9d %9.9s %s\n",
                                percent, tv_float(&counts[j].time),
-                               (long) 1000000 * dtv.tv_sec + dtv.tv_usec,
+                               (long) (1000000 * dtv.tv_sec + dtv.tv_usec),
                                counts[j].calls,
                                error_str, sysent[j].sys_name);
                }
diff --git a/ipc.c b/ipc.c
index 5fb2c67ccfc3f46c6bf3d83de08ef40e1a1471a8..bac99380e6e00bebad6bd06b303c5884f0cb08ee 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -482,7 +482,8 @@ sys_mq_open(struct tcb *tcp)
                                tprints("{ ??? }");
                        else
                                tprintf("{mq_maxmsg=%ld, mq_msgsize=%ld}",
-                                       attr.mq_maxmsg, attr.mq_msgsize);
+                                       (long) attr.mq_maxmsg,
+                                       (long) attr.mq_msgsize);
 # endif
                }
        }
@@ -541,7 +542,8 @@ printmqattr(struct tcb *tcp, long addr)
                tprints("{mq_flags=");
                tprint_open_modes(attr.mq_flags);
                tprintf(", mq_maxmsg=%ld, mq_msgsize=%ld, mq_curmsg=%ld}",
-                       attr.mq_maxmsg, attr.mq_msgsize, attr.mq_curmsgs);
+                       (long) attr.mq_maxmsg, (long) attr.mq_msgsize,
+                       (long) attr.mq_curmsgs);
 # endif
        }
 }
diff --git a/quota.c b/quota.c
index b0b7257c396bdaac72584f7e79aa17908fbe53d4..2ba297cd8e5e7906dd64bb504d8a836f7ce63041 100644 (file)
--- a/quota.c
+++ b/quota.c
@@ -380,8 +380,8 @@ decode_cmd_data(struct tcb *tcp, u_int32_t cmd, unsigned long data)
                        tprintf("ihardlimit=%u, ", dq.dqb_ihardlimit);
                        tprintf("isoftlimit=%u, ", dq.dqb_isoftlimit);
                        tprintf("curinodes=%u, ", dq.dqb_curinodes);
-                       tprintf("btime=%lu, ", dq.dqb_btime);
-                       tprintf("itime=%lu}", dq.dqb_itime);
+                       tprintf("btime=%lu, ", (long) dq.dqb_btime);
+                       tprintf("itime=%lu}", (long) dq.dqb_itime);
                        break;
                }
                case Q_V2_GETQUOTA:
@@ -403,8 +403,8 @@ decode_cmd_data(struct tcb *tcp, u_int32_t cmd, unsigned long data)
                        tprintf("bhardlimit=%u, ", dq.dqb_bhardlimit);
                        tprintf("bsoftlimit=%u, ", dq.dqb_bsoftlimit);
                        tprintf("curspace=%" PRIu64 ", ", dq.dqb_curspace);
-                       tprintf("btime=%lu, ", dq.dqb_btime);
-                       tprintf("itime=%lu}", dq.dqb_itime);
+                       tprintf("btime=%lu, ", (long) dq.dqb_btime);
+                       tprintf("itime=%lu}", (long) dq.dqb_itime);
                        break;
                }
                case Q_XGETQUOTA:
index 9a90ad82ae8533cef9a5c2259577ba6ba6480661..199ddf8f5d1186b4b9dfe039edb168ec595ec553 100644 (file)
@@ -399,14 +399,15 @@ sys_sysinfo(struct tcb *tcp)
                        tprints("{...}");
                else {
                        tprintf("{uptime=%lu, loads=[%lu, %lu, %lu] ",
-                               si.uptime, si.loads[0], si.loads[1],
-                               si.loads[2]);
+                               (long) si.uptime, (long) si.loads[0],
+                               (long) si.loads[1], (long) si.loads[2]);
                        tprintf("totalram=%lu, freeram=%lu, ",
-                               si.totalram, si.freeram);
+                               (long) si.totalram, (long) si.freeram);
                        tprintf("sharedram=%lu, bufferram=%lu} ",
-                               si.sharedram, si.bufferram);
+                               (long) si.sharedram, (long) si.bufferram);
                        tprintf("totalswap=%lu, freeswap=%lu, procs=%hu}",
-                               si.totalswap, si.freeswap, si.procs);
+                               (long) si.totalswap, (long) si.freeswap,
+                               si.procs);
                }
        }
        return 0;
diff --git a/time.c b/time.c
index 0c938f8ffff8f754384aa65b5b6bb41457ec75a0..897af3be754f7e91c515023cc787353dfc349ff7 100644 (file)
--- a/time.c
+++ b/time.c
@@ -580,19 +580,19 @@ tprint_timex(struct tcb *tcp, long addr)
        tprints("{modes=");
        printflags(adjtimex_modes, tx.modes, "ADJ_???");
        tprintf(", offset=%ld, freq=%ld, maxerror=%ld, ",
-               tx.offset, tx.freq, tx.maxerror);
-       tprintf("esterror=%lu, status=", tx.esterror);
+               (long) tx.offset, (long) tx.freq, (long) tx.maxerror);
+       tprintf("esterror=%lu, status=", (long) tx.esterror);
        printflags(adjtimex_status, tx.status, "STA_???");
        tprintf(", constant=%ld, precision=%lu, ",
-               tx.constant, tx.precision);
-       tprintf("tolerance=%ld, time=", tx.tolerance);
+               (long) tx.constant, (long) tx.precision);
+       tprintf("tolerance=%ld, time=", (long) tx.tolerance);
        tprint_timeval(tcp, &tx.time);
        tprintf(", tick=%ld, ppsfreq=%ld, jitter=%ld",
-               tx.tick, tx.ppsfreq, tx.jitter);
+               (long) tx.tick, (long) tx.ppsfreq, (long) tx.jitter);
        tprintf(", shift=%d, stabil=%ld, jitcnt=%ld",
-               tx.shift, tx.stabil, tx.jitcnt);
+               tx.shift, (long) tx.stabil, (long) tx.jitcnt);
        tprintf(", calcnt=%ld, errcnt=%ld, stbcnt=%ld",
-               tx.calcnt, tx.errcnt, tx.stbcnt);
+               (long) tx.calcnt, (long) tx.errcnt, (long) tx.stbcnt);
 #endif
        tprints("}");
        return 0;