diff options
author | brian <brian@FreeBSD.org> | 1999-08-09 22:56:18 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1999-08-09 22:56:18 +0000 |
commit | bef3aa58c70d8c43d1027dcd7f638a7de4fe6381 (patch) | |
tree | ecd9290a4ee072876793436601d6ade5feb46000 /usr.sbin/ppp | |
parent | 460ac15b25646ba12f3ff3575aab39ae035a5342 (diff) | |
download | FreeBSD-src-bef3aa58c70d8c43d1027dcd7f638a7de4fe6381.zip FreeBSD-src-bef3aa58c70d8c43d1027dcd7f638a7de4fe6381.tar.gz |
Change printf formats %q[du] -> %ll[du]
Diffstat (limited to 'usr.sbin/ppp')
-rw-r--r-- | usr.sbin/ppp/bundle.c | 6 | ||||
-rw-r--r-- | usr.sbin/ppp/mbuf.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/throughput.c | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c index ddb3736..353a546 100644 --- a/usr.sbin/ppp/bundle.c +++ b/usr.sbin/ppp/bundle.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bundle.c,v 1.59 1999/08/05 10:32:07 brian Exp $ + * $Id: bundle.c,v 1.60 1999/08/06 20:04:01 brian Exp $ */ #include <sys/param.h> @@ -1019,7 +1019,7 @@ bundle_ShowLinks(struct cmdargs const *arg) prompt_Printf(arg->prompt, "Name: %s [%s, %s]", dl->name, mode2Nam(dl->physical->type), datalink_State(dl)); if (dl->physical->link.throughput.rolling && dl->state == DATALINK_OPEN) - prompt_Printf(arg->prompt, " bandwidth %d, %qu bps (%qu bytes/sec)", + prompt_Printf(arg->prompt, " bandwidth %d, %llu bps (%llu bytes/sec)", dl->mp.bandwidth ? dl->mp.bandwidth : physical_GetSpeed(dl->physical), dl->physical->link.throughput.OctetsPerSecond * 8, @@ -1032,7 +1032,7 @@ bundle_ShowLinks(struct cmdargs const *arg) if (secs > t->SamplePeriod) secs = t->SamplePeriod; if (secs) - prompt_Printf(arg->prompt, "Currently averaging %qu bps (%qu bytes/sec)" + prompt_Printf(arg->prompt, "Currently averaging %llu bps (%llu bytes/sec)" " over the last %d secs\n", t->OctetsPerSecond * 8, t->OctetsPerSecond, secs); diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c index 49969d1..0f79ab0 100644 --- a/usr.sbin/ppp/mbuf.c +++ b/usr.sbin/ppp/mbuf.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: mbuf.c,v 1.26 1999/05/09 20:02:24 brian Exp $ + * $Id: mbuf.c,v 1.27 1999/06/02 15:59:04 brian Exp $ * */ #include <sys/types.h> @@ -240,7 +240,7 @@ mbuf_Show(struct cmdargs const *arg) prompt_Printf(arg->prompt, "%10.10s: %04d (%06d)\n", mbuftype[i], MemMap[i].fragments, MemMap[i].octets); - prompt_Printf(arg->prompt, "Mallocs: %qu, Frees: %qu\n", + prompt_Printf(arg->prompt, "Mallocs: %llu, Frees: %llu\n", mbuf_Mallocs, mbuf_Frees); return 0; diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c index af3b09a..e5d58f3 100644 --- a/usr.sbin/ppp/throughput.c +++ b/usr.sbin/ppp/throughput.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: throughput.c,v 1.10 1999/08/05 10:32:15 brian Exp $ + * $Id: throughput.c,v 1.11 1999/08/06 01:34:03 brian Exp $ */ #include <sys/types.h> @@ -101,7 +101,7 @@ throughput_disp(struct pppThroughput *t, struct prompt *prompt) prompt_Printf(prompt, "\n"); divisor = secs_up ? secs_up : 1; - prompt_Printf(prompt, "%qu octets in, %qu octets out\n", + prompt_Printf(prompt, "%llu octets in, %llu octets out\n", t->OctetsIn, t->OctetsOut); if (t->rolling) { prompt_Printf(prompt, " overall %6qu bytes/sec\n", @@ -113,7 +113,7 @@ throughput_disp(struct pppThroughput *t, struct prompt *prompt) prompt_Printf(prompt, " peak %6qu bytes/sec on %s", t->BestOctetsPerSecond, ctime(&t->BestOctetsPerSecondTime)); } else - prompt_Printf(prompt, "Overall %qu bytes/sec\n", + prompt_Printf(prompt, "Overall %llu bytes/sec\n", (t->OctetsIn + t->OctetsOut) / divisor); } @@ -126,19 +126,19 @@ throughput_log(struct pppThroughput *t, int level, const char *title) secs_up = throughput_uptime(t); if (title) - log_Printf(level, "%s: Connect time: %d secs: %qu octets in, %qu octets" + log_Printf(level, "%s: Connect time: %d secs: %llu octets in, %llu octets" " out\n", title, secs_up, t->OctetsIn, t->OctetsOut); else - log_Printf(level, "Connect time: %d secs: %qu octets in," - " %qu octets out\n", secs_up, t->OctetsIn, t->OctetsOut); + log_Printf(level, "Connect time: %d secs: %llu octets in," + " %llu octets out\n", secs_up, t->OctetsIn, t->OctetsOut); if (secs_up == 0) secs_up = 1; if (t->rolling) - log_Printf(level, " total %qu bytes/sec, peak %qu bytes/sec on %s", + log_Printf(level, " total %llu bytes/sec, peak %llu bytes/sec on %s", (t->OctetsIn + t->OctetsOut) / secs_up, t->BestOctetsPerSecond, ctime(&t->BestOctetsPerSecondTime)); else - log_Printf(level, " total %qu bytes/sec\n", + log_Printf(level, " total %llu bytes/sec\n", (t->OctetsIn + t->OctetsOut) / secs_up); } } |