Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use %ll_ instead of the less standard %q_

This commit is contained in:
lukem 2001-01-05 03:27:26 +00:00
parent 2537f730fa
commit c2aa46e7c2
14 changed files with 95 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/dumpfs/dumpfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dumpfs.c,v 1.21 2000/01/18 20:24:19 pk Exp $ */ /* $NetBSD: dumpfs.c,v 1.22 2001/01/05 03:27:26 lukem Exp $ */
/* /*
* Copyright (c) 1983, 1992, 1993 * Copyright (c) 1983, 1992, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1992, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#else #else
__RCSID("$NetBSD: dumpfs.c,v 1.21 2000/01/18 20:24:19 pk Exp $"); __RCSID("$NetBSD: dumpfs.c,v 1.22 2001/01/05 03:27:26 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -190,7 +190,7 @@ dumpfs(name)
printf("symlinklen %d\ttrackskew %d\tinterleave %d\tcontigsumsize %d\n", printf("symlinklen %d\ttrackskew %d\tinterleave %d\tcontigsumsize %d\n",
afs.fs_maxsymlinklen, afs.fs_trackskew, afs.fs_interleave, afs.fs_maxsymlinklen, afs.fs_trackskew, afs.fs_interleave,
afs.fs_contigsumsize); afs.fs_contigsumsize);
printf("maxfilesize 0x%016qx\n", printf("maxfilesize 0x%016llx\n",
(unsigned long long)afs.fs_maxfilesize); (unsigned long long)afs.fs_maxfilesize);
printf("nindir\t%d\tinopb\t%d\tnspf\t%d\n", printf("nindir\t%d\tinopb\t%d\tnspf\t%d\n",
afs.fs_nindir, afs.fs_inopb, afs.fs_nspf); afs.fs_nindir, afs.fs_inopb, afs.fs_nspf);
@ -282,7 +282,7 @@ dumpcg(name, fd, c)
} }
if (needswap) if (needswap)
swap_cg(&acg); swap_cg(&acg);
printf("magic\t%x\ttell\t%qx\ttime\t%s", printf("magic\t%x\ttell\t%llx\ttime\t%s",
afs.fs_postblformat == FS_42POSTBLFMT ? afs.fs_postblformat == FS_42POSTBLFMT ?
((struct ocg *)&acg)->cg_magic : acg.cg_magic, ((struct ocg *)&acg)->cg_magic : acg.cg_magic,
(long long)cur, ctime(&acg.cg_time)); (long long)cur, ctime(&acg.cg_time));

12
usr.sbin/dumplfs/dumplfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dumplfs.c,v 1.17 2000/11/13 00:30:48 perseant Exp $ */ /* $NetBSD: dumplfs.c,v 1.18 2001/01/05 03:27:26 lukem Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -45,7 +45,7 @@ __COPYRIGHT(
#if 0 #if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95"; static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#else #else
__RCSID("$NetBSD: dumplfs.c,v 1.17 2000/11/13 00:30:48 perseant Exp $"); __RCSID("$NetBSD: dumplfs.c,v 1.18 2001/01/05 03:27:26 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -405,7 +405,7 @@ dump_dinode(dip)
mt = dip->di_mtime; mt = dip->di_mtime;
ct = dip->di_ctime; ct = dip->di_ctime;
(void)printf("%s%d\t%s%d\t%s%d\t%s%d\t%s%qu\n", (void)printf("%s%d\t%s%d\t%s%d\t%s%d\t%s%llu\n",
"mode ", dip->di_mode, "mode ", dip->di_mode,
"nlink ", dip->di_nlink, "nlink ", dip->di_nlink,
"uid ", dip->di_uid, "uid ", dip->di_uid,
@ -598,19 +598,19 @@ dump_super(lfsp)
"cleansz ", lfsp->lfs_cleansz, "cleansz ", lfsp->lfs_cleansz,
"segtabsz ", lfsp->lfs_segtabsz); "segtabsz ", lfsp->lfs_segtabsz);
(void)printf("%s0x%x\t%s%d\t%s0x%qX\t%s%d\n", (void)printf("%s0x%x\t%s%d\t%s0x%llX\t%s%d\n",
"segmask ", lfsp->lfs_segmask, "segmask ", lfsp->lfs_segmask,
"segshift ", lfsp->lfs_segshift, "segshift ", lfsp->lfs_segshift,
"bmask ", (long long)lfsp->lfs_bmask, "bmask ", (long long)lfsp->lfs_bmask,
"bshift ", lfsp->lfs_bshift); "bshift ", lfsp->lfs_bshift);
(void)printf("%s0x%qX\t\t%s%d\t%s0x%qX\t%s%u\n", (void)printf("%s0x%llX\t\t%s%d\t%s0x%llX\t%s%u\n",
"ffmask ", (long long)lfsp->lfs_ffmask, "ffmask ", (long long)lfsp->lfs_ffmask,
"ffshift ", lfsp->lfs_ffshift, "ffshift ", lfsp->lfs_ffshift,
"fbmask ", (long long)lfsp->lfs_fbmask, "fbmask ", (long long)lfsp->lfs_fbmask,
"fbshift ", lfsp->lfs_fbshift); "fbshift ", lfsp->lfs_fbshift);
(void)printf("%s%d\t%s%d\t%s0x%x\t%s0x%qx\n", (void)printf("%s%d\t%s%d\t%s0x%x\t%s0x%llx\n",
"sushift ", lfsp->lfs_sushift, "sushift ", lfsp->lfs_sushift,
"fsbtodb ", lfsp->lfs_fsbtodb, "fsbtodb ", lfsp->lfs_fsbtodb,
"cksum ", lfsp->lfs_cksum, "cksum ", lfsp->lfs_cksum,

8
usr.sbin/eshconfig/eshconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eshconfig.c,v 1.3 2000/04/14 06:26:53 simonb Exp $ */ /* $NetBSD: eshconfig.c,v 1.4 2001/01/05 03:27:26 lukem Exp $ */
/* /*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: eshconfig.c,v 1.3 2000/04/14 06:26:53 simonb Exp $"); __RCSID("$NetBSD: eshconfig.c,v 1.4 2001/01/05 03:27:26 lukem Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -720,10 +720,10 @@ esh_stats(int get_stats)
value = (((long long) stats[0x78 / 4]) << 32) | stats[0x7c / 4]; value = (((long long) stats[0x78 / 4]) << 32) | stats[0x7c / 4];
if (get_stats == 1 || value > 0) if (get_stats == 1 || value > 0)
printf("%12qd bytes sent\n", value); printf("%12lld bytes sent\n", value);
value = ((long long) stats[0xb8 / 4] << 32) | stats[0xbc / 4]; value = ((long long) stats[0xb8 / 4] << 32) | stats[0xbc / 4];
if (get_stats == 1 || value > 0) if (get_stats == 1 || value > 0)
printf("%12qd bytes received\n", value); printf("%12lld bytes received\n", value);
for (offset = 0; stats_values[offset].offset != 0; offset++) { for (offset = 0; stats_values[offset].offset != 0; offset++) {
if (get_stats == 1 || stats[stats_values[offset].offset / 4] > 0) if (get_stats == 1 || stats[stats_values[offset].offset / 4] > 0)

6
usr.sbin/lpr/common_source/displayq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: displayq.c,v 1.18 2000/10/11 20:23:52 is Exp $ */ /* $NetBSD: displayq.c,v 1.19 2001/01/05 03:27:27 lukem Exp $ */
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: displayq.c,v 1.18 2000/10/11 20:23:52 is Exp $"); __RCSID("$NetBSD: displayq.c,v 1.19 2001/01/05 03:27:27 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -480,7 +480,7 @@ ldump(nfile, file, copies)
else else
printf("%-32s", nfile); printf("%-32s", nfile);
if (*file && !stat(file, &lbuf)) if (*file && !stat(file, &lbuf))
printf(" %qd bytes", (long long)lbuf.st_size); printf(" %lld bytes", (long long)lbuf.st_size);
else else
printf(" ??? bytes"); printf(" ??? bytes");
putchar('\n'); putchar('\n');

6
usr.sbin/lpr/lpd/printjob.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: printjob.c,v 1.25 2000/10/11 20:23:52 is Exp $ */ /* $NetBSD: printjob.c,v 1.26 2001/01/05 03:27:27 lukem Exp $ */
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95"; static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
#else #else
__RCSID("$NetBSD: printjob.c,v 1.25 2000/10/11 20:23:52 is Exp $"); __RCSID("$NetBSD: printjob.c,v 1.26 2001/01/05 03:27:27 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -869,7 +869,7 @@ sendfile(type, file)
if (S_ISLNK(stb.st_mode) && fstat(f, &stb) == 0 && if (S_ISLNK(stb.st_mode) && fstat(f, &stb) == 0 &&
(stb.st_dev != fdev || stb.st_ino != fino)) (stb.st_dev != fdev || stb.st_ino != fino))
return(ACCESS); return(ACCESS);
amt = snprintf(buf, sizeof(buf), "%c%qd %s\n", type, amt = snprintf(buf, sizeof(buf), "%c%lld %s\n", type,
(long long)stb.st_size, file); (long long)stb.st_size, file);
for (i = 0; ; i++) { for (i = 0; ; i++) {
if (write(pfd, buf, amt) != amt || if (write(pfd, buf, amt) != amt ||

6
usr.sbin/mdsetimage/mdsetimage.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mdsetimage.c,v 1.10 2000/06/14 17:26:18 cgd Exp $ */ /* $NetBSD: mdsetimage.c,v 1.11 2001/01/05 03:27:27 lukem Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou * Copyright (c) 1996 Christopher G. Demetriou
@ -42,7 +42,7 @@ __COPYRIGHT(
#endif /* not lint */ #endif /* not lint */
#ifndef lint #ifndef lint
__RCSID("$NetBSD: mdsetimage.c,v 1.10 2000/06/14 17:26:18 cgd Exp $"); __RCSID("$NetBSD: mdsetimage.c,v 1.11 2001/01/05 03:27:27 lukem Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -149,7 +149,7 @@ main(argc, argv)
if (fssb.st_size > SIZE_T_MAX) if (fssb.st_size > SIZE_T_MAX)
errx(1, "fs image is too big"); errx(1, "fs image is too big");
if (fssb.st_size > md_root_size) if (fssb.st_size > md_root_size)
errx(1, "fs image (%qd bytes) too big for buffer (%ld bytes)", errx(1, "fs image (%lld bytes) too big for buffer (%lu bytes)",
(long long)fssb.st_size, (unsigned long)md_root_size); (long long)fssb.st_size, (unsigned long)md_root_size);
if (verbose) if (verbose)

6
usr.sbin/mtree/compare.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compare.c,v 1.22 1999/07/10 19:59:28 christos Exp $ */ /* $NetBSD: compare.c,v 1.23 2001/01/05 03:27:27 lukem Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: compare.c,v 1.22 1999/07/10 19:59:28 christos Exp $"); __RCSID("$NetBSD: compare.c,v 1.23 2001/01/05 03:27:27 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -227,7 +227,7 @@ typeerr: LABEL;
} }
if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) { if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) {
LABEL; LABEL;
(void)printf("%ssize (%qd, %qd)\n", (void)printf("%ssize (%lld, %lld)\n",
tab, (long long)s->st_size, tab, (long long)s->st_size,
(long long)p->fts_statp->st_size); (long long)p->fts_statp->st_size);
tab = "\t"; tab = "\t";

78
usr.sbin/pim6sd/debug.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: debug.c,v 1.7 2000/12/04 07:09:35 itojun Exp $ */ /* $NetBSD: debug.c,v 1.8 2001/01/05 03:27:27 lukem Exp $ */
/* $KAME: debug.c,v 1.44 2000/12/04 06:45:29 itojun Exp $ */ /* $KAME: debug.c,v 1.44 2000/12/04 06:45:29 itojun Exp $ */
/* /*
@ -348,94 +348,94 @@ dump_stat()
continue; continue;
#endif #endif
fprintf(fp, " Mif=%d, PhyIF=%s\n", vifi, v->uv_name); fprintf(fp, " Mif=%d, PhyIF=%s\n", vifi, v->uv_name);
fprintf(fp, "\t%qu pim6 hello received\n", fprintf(fp, "\t%llu pim6 hello received\n",
(unsigned long long)v->uv_in_pim6_hello); (unsigned long long)v->uv_in_pim6_hello);
fprintf(fp, "\t%qu pim6 join-prune received\n", fprintf(fp, "\t%llu pim6 join-prune received\n",
(unsigned long long)v->uv_in_pim6_join_prune); (unsigned long long)v->uv_in_pim6_join_prune);
fprintf(fp, "\t%qu pim6 bootstrap received\n", fprintf(fp, "\t%llu pim6 bootstrap received\n",
(unsigned long long)v->uv_in_pim6_bootsrap); (unsigned long long)v->uv_in_pim6_bootsrap);
fprintf(fp, "\t%qu pim6 assert received\n", fprintf(fp, "\t%llu pim6 assert received\n",
(unsigned long long)v->uv_in_pim6_assert); (unsigned long long)v->uv_in_pim6_assert);
fprintf(fp, "\t%qu pim6 hello sent\n", fprintf(fp, "\t%llu pim6 hello sent\n",
(unsigned long long)v->uv_out_pim6_hello); (unsigned long long)v->uv_out_pim6_hello);
fprintf(fp, "\t%qu pim6 join-prune sent\n", fprintf(fp, "\t%llu pim6 join-prune sent\n",
(unsigned long long)v->uv_out_pim6_join_prune); (unsigned long long)v->uv_out_pim6_join_prune);
fprintf(fp, "\t%qu pim6 bootstrap sent\n", fprintf(fp, "\t%llu pim6 bootstrap sent\n",
(unsigned long long)v->uv_out_pim6_bootsrap); (unsigned long long)v->uv_out_pim6_bootsrap);
fprintf(fp, "\t%qu pim6 assert sent\n", fprintf(fp, "\t%llu pim6 assert sent\n",
(unsigned long long)v->uv_out_pim6_assert); (unsigned long long)v->uv_out_pim6_assert);
fprintf(fp, "\t%qu MLD query received\n", fprintf(fp, "\t%llu MLD query received\n",
(unsigned long long)v->uv_in_mld_query); (unsigned long long)v->uv_in_mld_query);
fprintf(fp, "\t%qu MLD report received\n", fprintf(fp, "\t%llu MLD report received\n",
(unsigned long long)v->uv_in_mld_report); (unsigned long long)v->uv_in_mld_report);
fprintf(fp, "\t%qu MLD done received\n", fprintf(fp, "\t%llu MLD done received\n",
(unsigned long long)v->uv_in_mld_done); (unsigned long long)v->uv_in_mld_done);
fprintf(fp, "\t%qu MLD query sent\n", fprintf(fp, "\t%llu MLD query sent\n",
(unsigned long long)v->uv_out_mld_query); (unsigned long long)v->uv_out_mld_query);
fprintf(fp, "\t%qu MLD report sent\n", fprintf(fp, "\t%llu MLD report sent\n",
(unsigned long long)v->uv_out_mld_report); (unsigned long long)v->uv_out_mld_report);
fprintf(fp, "\t%qu MLD done sent\n", fprintf(fp, "\t%llu MLD done sent\n",
(unsigned long long)v->uv_out_mld_done); (unsigned long long)v->uv_out_mld_done);
fprintf(fp, "\t%qu forwarding cache miss\n", fprintf(fp, "\t%llu forwarding cache miss\n",
(unsigned long long)v->uv_cache_miss); (unsigned long long)v->uv_cache_miss);
fprintf(fp, "\t%qu forwarding cache miss and not created\n", fprintf(fp, "\t%llu forwarding cache miss and not created\n",
(unsigned long long)v->uv_cache_notcreated); (unsigned long long)v->uv_cache_notcreated);
fprintf(fp, "\t%qu PIM neighbor timeouts\n", fprintf(fp, "\t%llu PIM neighbor timeouts\n",
(unsigned long long)v->uv_pim6_nbr_timo); (unsigned long long)v->uv_pim6_nbr_timo);
fprintf(fp, "\t%qu MLD listener timeouts\n", fprintf(fp, "\t%llu MLD listener timeouts\n",
(unsigned long long)v->uv_listener_timo); (unsigned long long)v->uv_listener_timo);
fprintf(fp, "\t%qu MLD querier timeouts\n", fprintf(fp, "\t%llu MLD querier timeouts\n",
(unsigned long long)v->uv_querier_timo); (unsigned long long)v->uv_querier_timo);
fprintf(fp, "\t%qu out-I/F timeouts\n", fprintf(fp, "\t%llu out-I/F timeouts\n",
(unsigned long long)v->uv_outif_timo); (unsigned long long)v->uv_outif_timo);
} }
fprintf(fp, "\npim6sd interface independent statistics\n"); fprintf(fp, "\npim6sd interface independent statistics\n");
fprintf(fp, "\t%qu pim6 register received\n", fprintf(fp, "\t%llu pim6 register received\n",
(unsigned long long)pim6dstat.in_pim6_register); (unsigned long long)pim6dstat.in_pim6_register);
fprintf(fp, "\t%qu pim6 register-stop received\n", fprintf(fp, "\t%llu pim6 register-stop received\n",
(unsigned long long)pim6dstat.in_pim6_register_stop); (unsigned long long)pim6dstat.in_pim6_register_stop);
fprintf(fp, "\t%qu pim6 cand-RP received\n", fprintf(fp, "\t%llu pim6 cand-RP received\n",
(unsigned long long)pim6dstat.in_pim6_cand_rp); (unsigned long long)pim6dstat.in_pim6_cand_rp);
fprintf(fp, "\t%qu pim6 graft received\n", fprintf(fp, "\t%llu pim6 graft received\n",
(unsigned long long)pim6dstat.in_pim6_graft); (unsigned long long)pim6dstat.in_pim6_graft);
fprintf(fp, "\t%qu pim6 graft ack received\n", fprintf(fp, "\t%llu pim6 graft ack received\n",
(unsigned long long)pim6dstat.in_pim6_graft_ack); (unsigned long long)pim6dstat.in_pim6_graft_ack);
fprintf(fp, "\t%qu pim6 register sent\n", fprintf(fp, "\t%llu pim6 register sent\n",
(unsigned long long)pim6dstat.out_pim6_register); (unsigned long long)pim6dstat.out_pim6_register);
fprintf(fp, "\t%qu pim6 register-stop sent\n", fprintf(fp, "\t%llu pim6 register-stop sent\n",
(unsigned long long)pim6dstat.out_pim6_register_stop); (unsigned long long)pim6dstat.out_pim6_register_stop);
fprintf(fp, "\t%qu pim6 cand-RP sent\n", fprintf(fp, "\t%llu pim6 cand-RP sent\n",
(unsigned long long)pim6dstat.out_pim6_cand_rp); (unsigned long long)pim6dstat.out_pim6_cand_rp);
fprintf(fp, "\t%qu transitions of forwarder initiated SPT\n", fprintf(fp, "\t%llu transitions of forwarder initiated SPT\n",
(unsigned long long)pim6dstat.pim6_trans_spt_forward); (unsigned long long)pim6dstat.pim6_trans_spt_forward);
fprintf(fp, "\t%qu transitions of RP initiated SPT\n", fprintf(fp, "\t%llu transitions of RP initiated SPT\n",
(unsigned long long)pim6dstat.pim6_trans_spt_rp); (unsigned long long)pim6dstat.pim6_trans_spt_rp);
fprintf(fp, "\t%qu pim6 bootstrap timeouts\n", fprintf(fp, "\t%llu pim6 bootstrap timeouts\n",
(unsigned long long)pim6dstat.pim6_bootstrap_timo); (unsigned long long)pim6dstat.pim6_bootstrap_timo);
fprintf(fp, "\t%qu pim6 RP group entry timeouts\n", fprintf(fp, "\t%llu pim6 RP group entry timeouts\n",
(unsigned long long)pim6dstat.pim6_rpgrp_timo); (unsigned long long)pim6dstat.pim6_rpgrp_timo);
fprintf(fp, "\t%qu pim6 routing entry timeouts\n", fprintf(fp, "\t%llu pim6 routing entry timeouts\n",
(unsigned long long)pim6dstat.pim6_rtentry_timo); (unsigned long long)pim6dstat.pim6_rtentry_timo);
fprintf(fp, "\t%qu kernel cache additions\n", fprintf(fp, "\t%llu kernel cache additions\n",
(unsigned long long)pim6dstat.kern_add_cache); (unsigned long long)pim6dstat.kern_add_cache);
fprintf(fp, "\t%qu kernel cache addition failures\n", fprintf(fp, "\t%llu kernel cache addition failures\n",
(unsigned long long)pim6dstat.kern_add_cache_fail); (unsigned long long)pim6dstat.kern_add_cache_fail);
fprintf(fp, "\t%qu kernel cache deletions\n", fprintf(fp, "\t%llu kernel cache deletions\n",
(unsigned long long)pim6dstat.kern_del_cache); (unsigned long long)pim6dstat.kern_del_cache);
fprintf(fp, "\t%qu kernel cache deletion failures\n", fprintf(fp, "\t%llu kernel cache deletion failures\n",
(unsigned long long)pim6dstat.kern_del_cache_fail); (unsigned long long)pim6dstat.kern_del_cache_fail);
fprintf(fp, "\t%qu failures of getting kernel cache\n", fprintf(fp, "\t%llu failures of getting kernel cache\n",
(unsigned long long)pim6dstat.kern_sgcnt_fail); (unsigned long long)pim6dstat.kern_sgcnt_fail);
fclose(fp); fclose(fp);

6
usr.sbin/pkg_install/lib/file.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: file.c,v 1.45 2000/12/13 03:49:56 hubertf Exp $ */ /* $NetBSD: file.c,v 1.46 2001/01/05 03:27:27 lukem Exp $ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp"; static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
#else #else
__RCSID("$NetBSD: file.c,v 1.45 2000/12/13 03:49:56 hubertf Exp $"); __RCSID("$NetBSD: file.c,v 1.46 2001/01/05 03:27:27 lukem Exp $");
#endif #endif
#endif #endif
@ -545,7 +545,7 @@ fileGetContents(char *fname)
} }
if (read(fd, contents, (size_t) sb.st_size) != (size_t) sb.st_size) { if (read(fd, contents, (size_t) sb.st_size) != (size_t) sb.st_size) {
cleanup(0); cleanup(0);
errx(2, "short read on '%s' - did not get %qd bytes", errx(2, "short read on '%s' - did not get %lld bytes",
fname, (long long) sb.st_size); fname, (long long) sb.st_size);
} }
close(fd); close(fd);

8
usr.sbin/pkg_install/lib/pen.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: pen.c,v 1.18 2000/11/26 03:12:01 hubertf Exp $ */ /* $NetBSD: pen.c,v 1.19 2001/01/05 03:27:28 lukem Exp $ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp"; static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
#else #else
__RCSID("$NetBSD: pen.c,v 1.18 2000/11/26 03:12:01 hubertf Exp $"); __RCSID("$NetBSD: pen.c,v 1.19 2001/01/05 03:27:28 lukem Exp $");
#endif #endif
#endif #endif
@ -139,7 +139,9 @@ make_playpen(char *pen, size_t pensize, size_t sz)
#endif #endif
if (Verbose) { if (Verbose) {
if (sz) if (sz)
fprintf(stderr, "Requested space: %lu bytes, free space: %qd bytes in %s\n", (u_long) sz, (long long) min_free(pen), pen); fprintf(stderr,
"Requested space: %lu bytes, free space: %lld bytes in %s\n",
(u_long) sz, (long long) min_free(pen), pen);
} }
if (min_free(pen) < sz) { if (min_free(pen) < sz) {
rmdir(pen); rmdir(pen);

12
usr.sbin/pstat/pstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pstat.c,v 1.56 2000/12/13 05:50:33 enami Exp $ */ /* $NetBSD: pstat.c,v 1.57 2001/01/05 03:27:28 lukem Exp $ */
/*- /*-
* Copyright (c) 1980, 1991, 1993, 1994 * Copyright (c) 1980, 1991, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
#if 0 #if 0
static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95"; static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95";
#else #else
__RCSID("$NetBSD: pstat.c,v 1.56 2000/12/13 05:50:33 enami Exp $"); __RCSID("$NetBSD: pstat.c,v 1.57 2001/01/05 03:27:28 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -489,7 +489,7 @@ ufs_print(vp)
else else
(void)printf(" %7s", name); (void)printf(" %7s", name);
else else
(void)printf(" %7qd", (long long)ip->i_ffs_size); (void)printf(" %7lld", (long long)ip->i_ffs_size);
return (0); return (0);
} }
@ -579,7 +579,7 @@ nfs_print(vp)
(void)printf(" %7s", name); (void)printf(" %7s", name);
break; break;
default: default:
(void)printf(" %7qd", (long long)np->n_size); (void)printf(" %7lld", (long long)np->n_size);
break; break;
} }
return (0); return (0);
@ -887,9 +887,9 @@ filemode()
(void)printf(" %3d", fp->f_msgcount); (void)printf(" %3d", fp->f_msgcount);
(void)printf(" %8.1lx", (long)fp->f_data); (void)printf(" %8.1lx", (long)fp->f_data);
if (fp->f_offset < 0) if (fp->f_offset < 0)
(void)printf(" %qx\n", (long long)fp->f_offset); (void)printf(" %llx\n", (long long)fp->f_offset);
else else
(void)printf(" %qd\n", (long long)fp->f_offset); (void)printf(" %lld\n", (long long)fp->f_offset);
} }
free(buf); free(buf);
} }

6
usr.sbin/sa/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.12 2000/07/29 19:13:34 christos Exp $ */ /* $NetBSD: main.c,v 1.13 2001/01/05 03:27:28 lukem Exp $ */
/* /*
* Copyright (c) 1994 Christopher G. Demetriou * Copyright (c) 1994 Christopher G. Demetriou
@ -39,7 +39,7 @@
__COPYRIGHT("@(#) Copyright (c) 1994 Christopher G. Demetriou\n\ __COPYRIGHT("@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
All rights reserved.\n"); All rights reserved.\n");
__RCSID("$NetBSD: main.c,v 1.12 2000/07/29 19:13:34 christos Exp $"); __RCSID("$NetBSD: main.c,v 1.13 2001/01/05 03:27:28 lukem Exp $");
#endif #endif
/* /*
@ -361,7 +361,7 @@ acct_load(pn, wr)
if (sflag || (mflag && !qflag)) if (sflag || (mflag && !qflag))
usracct_add(&ci); usracct_add(&ci);
} else if (!qflag) } else if (!qflag)
printf("%6u %12.2f cpu %12quk mem %12qu io %s\n", printf("%6u %12.2f cpu %12lluk mem %12llu io %s\n",
ci.ci_uid, ci.ci_uid,
(ci.ci_utime + ci.ci_stime) / (double) AHZ, (ci.ci_utime + ci.ci_stime) / (double) AHZ,
(unsigned long long)ci.ci_mem, (unsigned long long)ci.ci_mem,

12
usr.sbin/sa/pdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pdb.c,v 1.9 2000/07/29 19:15:40 christos Exp $ */ /* $NetBSD: pdb.c,v 1.10 2001/01/05 03:27:28 lukem Exp $ */
/* /*
* Copyright (c) 1994 Christopher G. Demetriou * Copyright (c) 1994 Christopher G. Demetriou
@ -36,7 +36,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: pdb.c,v 1.9 2000/07/29 19:15:40 christos Exp $"); __RCSID("$NetBSD: pdb.c,v 1.10 2001/01/05 03:27:28 lukem Exp $");
#endif #endif
#include <sys/types.h> #include <sys/types.h>
@ -327,7 +327,7 @@ check_junk(cip)
char *cp; char *cp;
size_t len; size_t len;
fprintf(stderr, "%s (%qu) -- ", cip->ci_comm, fprintf(stderr, "%s (%llu) -- ", cip->ci_comm,
(unsigned long long)cip->ci_calls); (unsigned long long)cip->ci_calls);
cp = fgetln(stdin, &len); cp = fgetln(stdin, &len);
@ -362,7 +362,7 @@ print_ci(cip, totalcip)
} else } else
uflow = 0; uflow = 0;
printf("%8qu ", (unsigned long long)cip->ci_calls); printf("%8llu ", (unsigned long long)cip->ci_calls);
if (cflag) { if (cflag) {
if (cip != totalcip) if (cip != totalcip)
printf(" %4.2f%% ", printf(" %4.2f%% ",
@ -427,12 +427,12 @@ print_ci(cip, totalcip)
} }
if (Dflag) if (Dflag)
printf("%10qutio ", (unsigned long long)cip->ci_io); printf("%10llutio ", (unsigned long long)cip->ci_io);
else else
printf("%8.0favio ", cip->ci_io / c); printf("%8.0favio ", cip->ci_io / c);
if (Kflag) if (Kflag)
printf("%10quk*sec ", (unsigned long long)cip->ci_mem); printf("%10lluk*sec ", (unsigned long long)cip->ci_mem);
else else
printf("%8.0fk ", cip->ci_mem / t); printf("%8.0fk ", cip->ci_mem / t);

14
usr.sbin/sa/usrdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usrdb.c,v 1.9 2000/07/29 19:15:40 christos Exp $ */ /* $NetBSD: usrdb.c,v 1.10 2001/01/05 03:27:28 lukem Exp $ */
/* /*
* Copyright (c) 1994 Christopher G. Demetriou * Copyright (c) 1994 Christopher G. Demetriou
@ -36,7 +36,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: usrdb.c,v 1.9 2000/07/29 19:15:40 christos Exp $"); __RCSID("$NetBSD: usrdb.c,v 1.10 2001/01/05 03:27:28 lukem Exp $");
#endif #endif
#include <sys/types.h> #include <sys/types.h>
@ -254,7 +254,7 @@ usracct_print()
while (rv == 0) { while (rv == 0) {
memcpy(ui, data.data, sizeof(struct userinfo)); memcpy(ui, data.data, sizeof(struct userinfo));
printf("%-8s %9qu ", printf("%-8s %9llu ",
user_from_uid(ui->ui_uid, 0), user_from_uid(ui->ui_uid, 0),
(unsigned long long)ui->ui_calls); (unsigned long long)ui->ui_calls);
@ -267,19 +267,19 @@ usracct_print()
/* ui->ui_calls is always != 0 */ /* ui->ui_calls is always != 0 */
if (dflag) if (dflag)
printf("%12qu%s", printf("%12llu%s",
(unsigned long long)(ui->ui_io / ui->ui_calls), (unsigned long long)(ui->ui_io / ui->ui_calls),
"avio"); "avio");
else else
printf("%12qu%s", printf("%12llu%s",
(unsigned long long)ui->ui_io, "tio"); (unsigned long long)ui->ui_io, "tio");
/* t is always >= 0.0001; see above */ /* t is always >= 0.0001; see above */
if (kflag) if (kflag)
printf("%12qu%s", (unsigned long long)(ui->ui_mem / t), printf("%12llu%s", (unsigned long long)(ui->ui_mem / t),
"k"); "k");
else else
printf("%12qu%s", (unsigned long long)ui->ui_mem, printf("%12llu%s", (unsigned long long)ui->ui_mem,
"k*sec"); "k*sec");
printf("\n"); printf("\n");