diff options
| author | Stefan Fritsch <sf@cvs.openbsd.org> | 2013-07-04 16:55:20 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@cvs.openbsd.org> | 2013-07-04 16:55:20 +0000 |
| commit | 636045de9ff94f9f06e9eb8dda0a78bf4dd24875 (patch) | |
| tree | 47d8e4997e65b8bcad673c550cca9ebf6b46ca2c /sys | |
| parent | cd031f94e597c7666c3af25b840adbf6ce5d4250 (diff) | |
Format string fixes:
f_count is long
ok kettenis@
Change esm_sensor_map.arg to int
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/esm.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_descrip.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c index c90b2c42aa1..bd34976ff04 100644 --- a/sys/arch/i386/i386/esm.c +++ b/sys/arch/i386/i386/esm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esm.c,v 1.53 2012/10/17 22:31:59 deraadt Exp $ */ +/* $OpenBSD: esm.c,v 1.54 2013/07/04 16:55:18 sf Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -87,7 +87,7 @@ enum sensor_type esm_typemap[] = { struct esm_sensor_map { enum esm_sensor_type type; - long arg; + int arg; const char *name; }; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 50eda54ad14..740ed9607bd 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.101 2013/06/11 13:00:31 tedu Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.102 2013/07/04 16:55:19 sf Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -1061,7 +1061,7 @@ closef(struct file *fp, struct proc *p) #ifdef DIAGNOSTIC if (fp->f_count < 2) - panic("closef: count (%d) < 2", fp->f_count); + panic("closef: count (%ld) < 2", fp->f_count); #endif fp->f_count--; @@ -1097,7 +1097,7 @@ fdrop(struct file *fp, struct proc *p) #ifdef DIAGNOSTIC if (fp->f_count != 0) - panic("fdrop: count (%d) != 0", fp->f_count); + panic("fdrop: count (%ld) != 0", fp->f_count); #endif if (fp->f_ops) |