Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin use %ll_ instead of the less standard %q_
details: https://anonhg.NetBSD.org/src/rev/1a6a642ae0d8
branches: trunk
changeset: 501634:1a6a642ae0d8
user: lukem <lukem%NetBSD.org@localhost>
date: Fri Jan 05 03:27:26 2001 +0000
description:
use %ll_ instead of the less standard %q_
diffstat:
usr.sbin/dumpfs/dumpfs.c | 8 +-
usr.sbin/dumplfs/dumplfs.c | 12 ++--
usr.sbin/eshconfig/eshconfig.c | 8 +-
usr.sbin/lpr/common_source/displayq.c | 6 +-
usr.sbin/lpr/lpd/printjob.c | 6 +-
usr.sbin/mdsetimage/mdsetimage.c | 6 +-
usr.sbin/mtree/compare.c | 6 +-
usr.sbin/pim6sd/debug.c | 78 +++++++++++++++++-----------------
usr.sbin/pkg_install/lib/file.c | 6 +-
usr.sbin/pkg_install/lib/pen.c | 8 ++-
usr.sbin/pstat/pstat.c | 12 ++--
usr.sbin/sa/main.c | 6 +-
usr.sbin/sa/pdb.c | 12 ++--
usr.sbin/sa/usrdb.c | 14 +++---
14 files changed, 95 insertions(+), 93 deletions(-)
diffs (truncated from 598 to 300 lines):
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/dumpfs/dumpfs.c
--- a/usr.sbin/dumpfs/dumpfs.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/dumpfs/dumpfs.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#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 /* not lint */
@@ -190,7 +190,7 @@
printf("symlinklen %d\ttrackskew %d\tinterleave %d\tcontigsumsize %d\n",
afs.fs_maxsymlinklen, afs.fs_trackskew, afs.fs_interleave,
afs.fs_contigsumsize);
- printf("maxfilesize 0x%016qx\n",
+ printf("maxfilesize 0x%016llx\n",
(unsigned long long)afs.fs_maxfilesize);
printf("nindir\t%d\tinopb\t%d\tnspf\t%d\n",
afs.fs_nindir, afs.fs_inopb, afs.fs_nspf);
@@ -282,7 +282,7 @@
}
if (needswap)
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 ?
((struct ocg *)&acg)->cg_magic : acg.cg_magic,
(long long)cur, ctime(&acg.cg_time));
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/dumplfs/dumplfs.c
--- a/usr.sbin/dumplfs/dumplfs.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/dumplfs/dumplfs.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#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 /* not lint */
@@ -405,7 +405,7 @@
mt = dip->di_mtime;
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,
"nlink ", dip->di_nlink,
"uid ", dip->di_uid,
@@ -598,19 +598,19 @@
"cleansz ", lfsp->lfs_cleansz,
"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,
"segshift ", lfsp->lfs_segshift,
"bmask ", (long long)lfsp->lfs_bmask,
"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,
"ffshift ", lfsp->lfs_ffshift,
"fbmask ", (long long)lfsp->lfs_fbmask,
"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,
"fsbtodb ", lfsp->lfs_fsbtodb,
"cksum ", lfsp->lfs_cksum,
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/eshconfig/eshconfig.c
--- a/usr.sbin/eshconfig/eshconfig.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/eshconfig/eshconfig.c Fri Jan 05 03:27:26 2001 +0000
@@ -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.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#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 */
#include <sys/param.h>
@@ -720,10 +720,10 @@
value = (((long long) stats[0x78 / 4]) << 32) | stats[0x7c / 4];
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];
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++) {
if (get_stats == 1 || stats[stats_values[offset].offset / 4] > 0)
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/lpr/common_source/displayq.c
--- a/usr.sbin/lpr/common_source/displayq.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/lpr/common_source/displayq.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
#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 /* not lint */
@@ -480,7 +480,7 @@
else
printf("%-32s", nfile);
if (*file && !stat(file, &lbuf))
- printf(" %qd bytes", (long long)lbuf.st_size);
+ printf(" %lld bytes", (long long)lbuf.st_size);
else
printf(" ??? bytes");
putchar('\n');
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/lpr/lpd/printjob.c
--- a/usr.sbin/lpr/lpd/printjob.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/lpr/lpd/printjob.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
#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 /* not lint */
@@ -869,7 +869,7 @@
if (S_ISLNK(stb.st_mode) && fstat(f, &stb) == 0 &&
(stb.st_dev != fdev || stb.st_ino != fino))
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);
for (i = 0; ; i++) {
if (write(pfd, buf, amt) != amt ||
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/mdsetimage/mdsetimage.c
--- a/usr.sbin/mdsetimage/mdsetimage.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/mdsetimage/mdsetimage.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -42,7 +42,7 @@
#endif /* not 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 */
#include <sys/types.h>
@@ -149,7 +149,7 @@
if (fssb.st_size > SIZE_T_MAX)
errx(1, "fs image is too big");
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);
if (verbose)
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/mtree/compare.c
--- a/usr.sbin/mtree/compare.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/mtree/compare.c Fri Jan 05 03:27:26 2001 +0000
@@ -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
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93";
#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 /* not lint */
@@ -227,7 +227,7 @@
}
if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) {
LABEL;
- (void)printf("%ssize (%qd, %qd)\n",
+ (void)printf("%ssize (%lld, %lld)\n",
tab, (long long)s->st_size,
(long long)p->fts_statp->st_size);
tab = "\t";
diff -r 6971de70f280 -r 1a6a642ae0d8 usr.sbin/pim6sd/debug.c
--- a/usr.sbin/pim6sd/debug.c Fri Jan 05 03:21:53 2001 +0000
+++ b/usr.sbin/pim6sd/debug.c Fri Jan 05 03:27:26 2001 +0000
@@ -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 $ */
/*
@@ -348,94 +348,94 @@
continue;
#endif
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);
- 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);
- fprintf(fp, "\t%qu pim6 bootstrap received\n",
+ fprintf(fp, "\t%llu pim6 bootstrap received\n",
(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);
- fprintf(fp, "\t%qu pim6 hello sent\n",
+ fprintf(fp, "\t%llu pim6 hello sent\n",
(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);
- fprintf(fp, "\t%qu pim6 bootstrap sent\n",
+ fprintf(fp, "\t%llu pim6 bootstrap sent\n",
(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);
- fprintf(fp, "\t%qu MLD query received\n",
+ fprintf(fp, "\t%llu MLD query received\n",
(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);
- fprintf(fp, "\t%qu MLD done received\n",
+ fprintf(fp, "\t%llu MLD done received\n",
(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);
- fprintf(fp, "\t%qu MLD report sent\n",
+ fprintf(fp, "\t%llu MLD report sent\n",
(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);
- fprintf(fp, "\t%qu forwarding cache miss\n",
+ fprintf(fp, "\t%llu forwarding cache miss\n",
(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);
- fprintf(fp, "\t%qu PIM neighbor timeouts\n",
+ fprintf(fp, "\t%llu PIM neighbor timeouts\n",
(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);
- fprintf(fp, "\t%qu MLD querier timeouts\n",
+ fprintf(fp, "\t%llu MLD querier timeouts\n",
(unsigned long long)v->uv_querier_timo);
Home |
Main Index |
Thread Index |
Old Index