summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/subr_prf.c8
-rw-r--r--sys/kern/vfs_lockf.c6
-rw-r--r--sys/netinet/ip_ipsp.c28
-rw-r--r--sys/ufs/ufs/ufs_vnops.c4
-rw-r--r--sys/uvm/uvm_swap.c6
-rw-r--r--sys/uvm/uvm_vnode.c4
6 files changed, 28 insertions, 28 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index cf2b0999813..6d24ef3e021 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_prf.c,v 1.33 2001/06/27 04:49:46 art Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.34 2001/09/05 19:22:23 deraadt Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
@@ -822,11 +822,11 @@ reswitch: switch (ch) {
_uquad = va_arg(ap, u_int);
b = va_arg(ap, char *);
if (*b == 8)
- sprintf(buf, "%qo", _uquad);
+ sprintf(buf, "%llo", _uquad);
else if (*b == 10)
- sprintf(buf, "%qd", _uquad);
+ sprintf(buf, "%lld", _uquad);
else if (*b == 16)
- sprintf(buf, "%qx", _uquad);
+ sprintf(buf, "%llx", _uquad);
else
break;
b++;
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c
index 86c4ceeb01b..ad58b050733 100644
--- a/sys/kern/vfs_lockf.c
+++ b/sys/kern/vfs_lockf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_lockf.c,v 1.4 2001/07/28 17:03:50 gluk Exp $ */
+/* $OpenBSD: vfs_lockf.c,v 1.5 2001/09/05 19:22:23 deraadt Exp $ */
/* $NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $ */
/*
@@ -712,7 +712,7 @@ lf_print(tag, lock)
printf("proc %d", ((struct proc *)(lock->lf_id))->p_pid);
else
printf("id %p", lock->lf_id);
- printf(" %s, start %qx, end %qx",
+ printf(" %s, start %llx, end %llx",
lock->lf_type == F_RDLCK ? "shared" :
lock->lf_type == F_WRLCK ? "exclusive" :
lock->lf_type == F_UNLCK ? "unlock" :
@@ -740,7 +740,7 @@ lf_printlist(tag, lock)
printf("proc %d", ((struct proc*)(lf->lf_id))->p_pid);
else
printf("id %p", lf->lf_id);
- printf(" %s, start %qx, end %qx",
+ printf(" %s, start %llx, end %llx",
lf->lf_type == F_RDLCK ? "shared" :
lf->lf_type == F_WRLCK ? "exclusive" :
lf->lf_type == F_UNLCK ? "unlock" :
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 483615a3587..22f35e55247 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.c,v 1.141 2001/08/08 15:07:04 jjbg Exp $ */
+/* $OpenBSD: ip_ipsp.c,v 1.142 2001/09/05 19:22:23 deraadt Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -880,7 +880,7 @@ ipsp_print_tdb(struct tdb *tdb, char *buffer)
l += sprintf(buffer + l, "\n");
if (tdb->tdb_mtu && tdb->tdb_mtutimeout > time.tv_sec)
- l += sprintf(buffer + l, "\tMTU: %d, expires in %qu seconds\n",
+ l += sprintf(buffer + l, "\tMTU: %d, expires in %llu seconds\n",
tdb->tdb_mtu, tdb->tdb_mtutimeout - time.tv_sec);
if (tdb->tdb_local_cred)
@@ -921,7 +921,7 @@ ipsp_print_tdb(struct tdb *tdb, char *buffer)
l += sprintf(buffer + l, ">\n");
}
- l += sprintf(buffer + l, "\tCrypto ID: %qu\n", tdb->tdb_cryptoid);
+ l += sprintf(buffer + l, "\tCrypto ID: %llu\n", tdb->tdb_cryptoid);
if (tdb->tdb_xform)
l += sprintf(buffer + l, "\txform = <%s>\n",
@@ -949,39 +949,39 @@ ipsp_print_tdb(struct tdb *tdb, char *buffer)
ipsp_address(tdb->tdb_inext->tdb_dst),
tdb->tdb_inext->tdb_sproto);
- l += sprintf(buffer + l, "\t%qu bytes processed by this SA\n",
+ l += sprintf(buffer + l, "\t%llu bytes processed by this SA\n",
tdb->tdb_cur_bytes);
if (tdb->tdb_last_used)
- l += sprintf(buffer + l, "\tLast used %qu seconds ago\n",
+ l += sprintf(buffer + l, "\tLast used %llu seconds ago\n",
time.tv_sec - tdb->tdb_last_used);
if (tdb->tdb_last_marked)
l += sprintf(buffer + l,
- "\tLast marked/unmarked %qu seconds ago\n",
+ "\tLast marked/unmarked %llu seconds ago\n",
time.tv_sec - tdb->tdb_last_marked);
l += sprintf(buffer + l, "\tExpirations:\n");
if (tdb->tdb_flags & TDBF_TIMER)
l += sprintf(buffer + l,
- "\t\tHard expiration(1) in %qu seconds\n",
+ "\t\tHard expiration(1) in %llu seconds\n",
tdb->tdb_established + tdb->tdb_exp_timeout - time.tv_sec);
if (tdb->tdb_flags & TDBF_SOFT_TIMER)
l += sprintf(buffer + l,
- "\t\tSoft expiration(1) in %qu seconds\n",
+ "\t\tSoft expiration(1) in %llu seconds\n",
tdb->tdb_established + tdb->tdb_soft_timeout -
time.tv_sec);
if (tdb->tdb_flags & TDBF_BYTES)
l += sprintf(buffer + l,
- "\t\tHard expiration after %qu bytes\n",
+ "\t\tHard expiration after %llu bytes\n",
tdb->tdb_exp_bytes);
if (tdb->tdb_flags & TDBF_SOFT_BYTES)
l += sprintf(buffer + l,
- "\t\tSoft expiration after %qu bytes\n",
+ "\t\tSoft expiration after %llu bytes\n",
tdb->tdb_soft_bytes);
if (tdb->tdb_flags & TDBF_ALLOCATIONS)
@@ -997,12 +997,12 @@ ipsp_print_tdb(struct tdb *tdb, char *buffer)
if (tdb->tdb_flags & TDBF_FIRSTUSE) {
if (tdb->tdb_first_use)
l += sprintf(buffer + l,
- "\t\tHard expiration(2) in %qu seconds\n",
+ "\t\tHard expiration(2) in %llu seconds\n",
(tdb->tdb_first_use + tdb->tdb_exp_first_use) -
time.tv_sec);
else
l += sprintf(buffer + l,
- "\t\tHard expiration in %qu seconds "
+ "\t\tHard expiration in %llu seconds "
"after first use\n",
tdb->tdb_exp_first_use);
}
@@ -1010,12 +1010,12 @@ ipsp_print_tdb(struct tdb *tdb, char *buffer)
if (tdb->tdb_flags & TDBF_SOFT_FIRSTUSE) {
if (tdb->tdb_first_use)
l += sprintf(buffer + l,
- "\t\tSoft expiration(2) in %qu seconds\n",
+ "\t\tSoft expiration(2) in %llu seconds\n",
(tdb->tdb_first_use + tdb->tdb_soft_first_use) -
time.tv_sec);
else
l += sprintf(buffer + l,
- "\t\tSoft expiration in %qu seconds "
+ "\t\tSoft expiration in %llu seconds "
"after first use\n", tdb->tdb_soft_first_use);
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 1347b1736f1..33109b9f4f3 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.36 2001/07/26 20:24:47 millert Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.37 2001/09/05 19:22:23 deraadt Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1823,7 +1823,7 @@ ufs_print(v)
major(ip->i_dev), minor(ip->i_dev));
printf(" flags 0x%x, effnlink %d, nlink %d\n",
ip->i_flag, ip->i_effnlink, ip->i_ffs_nlink);
- printf("\tmode 0%o, owner %d, group %d, size %qd",
+ printf("\tmode 0%o, owner %d, group %d, size %lld",
ip->i_ffs_mode, ip->i_ffs_uid, ip->i_ffs_gid, ip->i_ffs_size);
#ifdef FIFO
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 4eddeba5d8b..370573e78aa 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.35 2001/08/31 15:26:18 mickey Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.36 2001/09/05 19:22:23 deraadt Exp $ */
/* $NetBSD: uvm_swap.c,v 1.37 2000/05/19 03:45:04 thorpej Exp $ */
/*
@@ -1219,7 +1219,7 @@ swread(dev, uio, ioflag)
{
UVMHIST_FUNC("swread"); UVMHIST_CALLED(pdhist);
- UVMHIST_LOG(pdhist, " dev=%x offset=%qx", dev, uio->uio_offset, 0, 0);
+ UVMHIST_LOG(pdhist, " dev=%x offset=%llx", dev, uio->uio_offset, 0, 0);
return (physio(swstrategy, NULL, dev, B_READ, minphys, uio));
}
@@ -1235,7 +1235,7 @@ swwrite(dev, uio, ioflag)
{
UVMHIST_FUNC("swwrite"); UVMHIST_CALLED(pdhist);
- UVMHIST_LOG(pdhist, " dev=%x offset=%qx", dev, uio->uio_offset, 0, 0);
+ UVMHIST_LOG(pdhist, " dev=%x offset=%llx", dev, uio->uio_offset, 0, 0);
return (physio(swstrategy, NULL, dev, B_WRITE, minphys, uio));
}
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index cb362452c27..f24605a1404 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_vnode.c,v 1.18 2001/08/11 10:57:22 art Exp $ */
+/* $OpenBSD: uvm_vnode.c,v 1.19 2001/09/05 19:22:23 deraadt Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.33 2000/05/19 03:45:05 thorpej Exp $ */
/*
@@ -287,7 +287,7 @@ uvn_attach(arg, accessprot)
*/
#ifdef DEBUG
if (vp->v_type == VBLK)
- printf("used_vnode_size = %qu\n", (long long)used_vnode_size);
+ printf("used_vnode_size = %llu\n", (long long)used_vnode_size);
#endif
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:42:24 +0000