Module Name: src
Committed By: christos
Date: Sat Apr 5 18:44:32 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: procfs_machdep.c
src/sys/arch/arm/arm: procfs_machdep.c
src/sys/arch/hppa/hppa: procfs_machdep.c
src/sys/arch/m68k/m68k: procfs_machdep.c
src/sys/arch/mips/mips: procfs_machdep.c
src/sys/arch/powerpc/powerpc: procfs_machdep.c
src/sys/arch/sh3/sh3: procfs_machdep.c
src/sys/arch/sparc/sparc: procfs_machdep.c
src/sys/arch/sparc64/sparc64: procfs_machdep.c
src/sys/arch/usermode/usermode: procfs_machdep.c
src/sys/arch/vax/vax: procfs_machdep.c
Log Message:
adjust to new signature; return consistent stuff. 0 is ok -1 is error
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/alpha/procfs_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/procfs_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/hppa/procfs_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/m68k/procfs_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/mips/procfs_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/procfs_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sh3/sh3/procfs_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/sparc/procfs_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/sparc64/procfs_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/usermode/procfs_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/procfs_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/procfs_machdep.c
diff -u src/sys/arch/alpha/alpha/procfs_machdep.c:1.4 src/sys/arch/alpha/alpha/procfs_machdep.c:1.5
--- src/sys/arch/alpha/alpha/procfs_machdep.c:1.4 Sun Dec 11 07:16:10 2005
+++ src/sys/arch/alpha/alpha/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:16:10 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:16:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/arm/arm/procfs_machdep.c
diff -u src/sys/arch/arm/arm/procfs_machdep.c:1.3 src/sys/arch/arm/arm/procfs_machdep.c:1.4
--- src/sys/arch/arm/arm/procfs_machdep.c:1.3 Sun Dec 11 07:16:41 2005
+++ src/sys/arch/arm/arm/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.3 2005/12/11 12:16:41 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.3 2005/12/11 12:16:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/hppa/hppa/procfs_machdep.c
diff -u src/sys/arch/hppa/hppa/procfs_machdep.c:1.3 src/sys/arch/hppa/hppa/procfs_machdep.c:1.4
--- src/sys/arch/hppa/hppa/procfs_machdep.c:1.3 Sun Dec 11 07:17:37 2005
+++ src/sys/arch/hppa/hppa/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.3 2005/12/11 12:17:37 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.3 2005/12/11 12:17:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/m68k/m68k/procfs_machdep.c
diff -u src/sys/arch/m68k/m68k/procfs_machdep.c:1.6 src/sys/arch/m68k/m68k/procfs_machdep.c:1.7
--- src/sys/arch/m68k/m68k/procfs_machdep.c:1.6 Sat Mar 29 07:34:13 2014
+++ src/sys/arch/m68k/m68k/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.6 2014/03/29 11:34:13 apb Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.7 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6 2014/03/29 11:34:13 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.7 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -16,10 +16,10 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
const char *cpu, *mmu, *fpu;
- int maxlen = *len;
+ size_t size = *len;
switch (cputype) {
case CPU_68020:
@@ -78,7 +78,7 @@ procfs_getcpuinfstr(char *buf, int *len)
break;
}
- *len = snprintf(buf, maxlen,
+ *len = snprintf(buf, size,
/* as seen in Linux 2.4.27 */
"CPU:\t\t%s\n"
"MMU:\t\t%s\n"
@@ -88,6 +88,5 @@ procfs_getcpuinfstr(char *buf, int *len)
* "BogoMips" and "Calibration".
*/
cpu, mmu, fpu);
-
- return 0;
+ return size < *len ? -1 : 0;
}
Index: src/sys/arch/mips/mips/procfs_machdep.c
diff -u src/sys/arch/mips/mips/procfs_machdep.c:1.4 src/sys/arch/mips/mips/procfs_machdep.c:1.5
--- src/sys/arch/mips/mips/procfs_machdep.c:1.4 Sun Dec 11 07:18:09 2005
+++ src/sys/arch/mips/mips/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:18:09 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:18:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -14,7 +14,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/powerpc/powerpc/procfs_machdep.c
diff -u src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.7 src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.8
--- src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.7 Wed Oct 17 15:56:48 2007
+++ src/sys/arch/powerpc/powerpc/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.7 2007/10/17 19:56:48 garbled Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.8 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.7 2007/10/17 19:56:48 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.8 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -20,9 +20,9 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
- *len = 0;
+ *size_t = 0;
return 0;
}
Index: src/sys/arch/sh3/sh3/procfs_machdep.c
diff -u src/sys/arch/sh3/sh3/procfs_machdep.c:1.5 src/sys/arch/sh3/sh3/procfs_machdep.c:1.6
--- src/sys/arch/sh3/sh3/procfs_machdep.c:1.5 Sun Dec 11 07:19:00 2005
+++ src/sys/arch/sh3/sh3/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.5 2005/12/11 12:19:00 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.6 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2005/12/11 12:19:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/sparc/sparc/procfs_machdep.c
diff -u src/sys/arch/sparc/sparc/procfs_machdep.c:1.4 src/sys/arch/sparc/sparc/procfs_machdep.c:1.5
--- src/sys/arch/sparc/sparc/procfs_machdep.c:1.4 Sun Dec 11 07:19:08 2005
+++ src/sys/arch/sparc/sparc/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:19:08 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:19:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
Index: src/sys/arch/sparc64/sparc64/procfs_machdep.c
diff -u src/sys/arch/sparc64/sparc64/procfs_machdep.c:1.5 src/sys/arch/sparc64/sparc64/procfs_machdep.c:1.6
--- src/sys/arch/sparc64/sparc64/procfs_machdep.c:1.5 Sun Dec 11 07:19:15 2005
+++ src/sys/arch/sparc64/sparc64/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.5 2005/12/11 12:19:15 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.6 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2005/12/11 12:19:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *sbuf, int *len)
+procfs_getcpuinfstr(char *sbuf, size_t *len)
{
*len = 0;
Index: src/sys/arch/usermode/usermode/procfs_machdep.c
diff -u src/sys/arch/usermode/usermode/procfs_machdep.c:1.3 src/sys/arch/usermode/usermode/procfs_machdep.c:1.4
--- src/sys/arch/usermode/usermode/procfs_machdep.c:1.3 Wed Dec 14 20:30:04 2011
+++ src/sys/arch/usermode/usermode/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.3 2011/12/15 01:30:04 jmcneill Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: procfs_machdep.c,v 1.3 2011/12/15 01:30:04 jmcneill Exp $");
+__RCSID("$NetBSD: procfs_machdep.c,v 1.4 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __RCSID("$NetBSD: procfs_machdep.c,v 1.3
#include <machine/thunk.h>
int
-procfs_getcpuinfstr(char *bf, int *len)
+procfs_getcpuinfstr(char *bf, size_t *len)
{
return thunk_getcpuinfo(bf, len);
}
Index: src/sys/arch/vax/vax/procfs_machdep.c
diff -u src/sys/arch/vax/vax/procfs_machdep.c:1.4 src/sys/arch/vax/vax/procfs_machdep.c:1.5
--- src/sys/arch/vax/vax/procfs_machdep.c:1.4 Sun Dec 11 07:19:36 2005
+++ src/sys/arch/vax/vax/procfs_machdep.c Sat Apr 5 14:44:32 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:19:36 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2005/12/11 12:19:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2014/04/05 18:44:32 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* Only used when procfs is mounted with -o linux.
*/
int
-procfs_getcpuinfstr(char *buf, int *len)
+procfs_getcpuinfstr(char *buf, size_t *len)
{
*len = 0;
