diff options
| author |   sf <sf@openbsd.org> | 2013-07-03 15:26:02 +0000 |
|---|---|---|
| committer | sf <sf@openbsd.org> | 2013-07-03 15:26:02 +0000 |
| commit | 71e51adf3e752cfbd6491d06e63ce4f6cd58231e (patch) | |
| tree | 3fca171d42abac2f17e92aee3cad9c6c2b4c8a62 | |
| parent | don't use empty format string (diff) | |
| download | wireguard-openbsd-71e51adf3e752cfbd6491d06e63ce4f6cd58231e.tar.xz wireguard-openbsd-71e51adf3e752cfbd6491d06e63ce4f6cd58231e.zip | |
cast time_t to long long, time_t is signed, tv_nsec is long
ok deraadt@
| -rw-r--r-- | sys/dev/vmt.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/procfs/procfs_status.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/vmt.c b/sys/dev/vmt.c index 5fb5e1e30ef..d0482f3e195 100644 --- a/sys/dev/vmt.c +++ b/sys/dev/vmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmt.c,v 1.12 2012/09/11 04:40:14 dtucker Exp $ */ +/* $OpenBSD: vmt.c,v 1.13 2013/07/03 15:26:02 sf Exp $ */ /* * Copyright (c) 2007 David Crawshaw <david@zentus.com> @@ -313,8 +313,8 @@ void vmt_update_guest_uptime(struct vmt_softc *sc) { /* host wants uptime in hundredths of a second */ - if (vm_rpc_send_rpci_tx(sc, "SetGuestInfo %d %lu00", - VM_GUEST_INFO_UPTIME, time_uptime) != 0) { + if (vm_rpc_send_rpci_tx(sc, "SetGuestInfo %d %lld00", + VM_GUEST_INFO_UPTIME, (long long)time_uptime) != 0) { printf("%s: unable to set guest uptime", DEVNAME(sc)); sc->sc_rpc_error = 1; } diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c index 89cec594922..dde79b0c5ae 100644 --- a/sys/miscfs/procfs/procfs_status.c +++ b/sys/miscfs/procfs/procfs_status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_status.c,v 1.13 2013/06/03 16:55:22 guenther Exp $ */ +/* $OpenBSD: procfs_status.c,v 1.14 2013/07/03 15:26:03 sf Exp $ */ /* $NetBSD: procfs_status.c,v 1.11 1996/03/16 23:52:50 christos Exp $ */ /* @@ -117,8 +117,8 @@ procfs_stat_gen(struct proc *p, char *s, int l) COUNTORCAT(s, l, ps, n); } - snprintf(ps, sizeof(ps), " %ld,%ld", - pr->ps_start.tv_sec, pr->ps_start.tv_nsec/1000); + snprintf(ps, sizeof(ps), " %lld,%ld", + (long long)pr->ps_start.tv_sec, pr->ps_start.tv_nsec/1000); COUNTORCAT(s, l, ps, n); calcru(&pr->ps_tu, &ut, &st, (void *) 0); |