Rename cerror to __cerror and curbrk to __curbrk, to avoid namespace

pollution. Conforming to art@'s evil plans.

8 files changed, 25 insertions, 25 deletions

diff --git a/lib/libc/arch/vax/SYS.h b/lib/libc/arch/vax/SYS.h
index 916853c1a36..6f7a0966ce4 100644
--- a/lib/libc/arch/vax/SYS.h
+++ b/lib/libc/arch/vax/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.10 2002/11/03 23:58:39 marc Exp $ */
+/*	$OpenBSD: SYS.h,v 1.11 2002/11/05 00:37:05 miod Exp $ */
 /*	$NetBSD: SYS.h,v 1.4 1997/05/02 18:15:32 kleink Exp $ */
 
 /*
@@ -48,13 +48,13 @@
 #endif
 
 #define	__SYSCALL(p,x,y)						\
-	err:	jmp cerror;						\
+	err:	jmp __cerror;						\
 	__ENTRY(p,x);							\
 		__DO_SYSCALL(y);					\
 		jcs err
 
 #define	__PSEUDO(p,x,y)							\
-	err:	jmp cerror;						\
+	err:	jmp __cerror;						\
 	__ENTRY(p,x);							\
 		__DO_SYSCALL(y);					\
 		jcs err;						\
@@ -89,4 +89,4 @@
 #define	SYSNAME(x)		_CAT(_,x)
 #endif _THREAD_SAFE
 
-	.globl	cerror
+	.globl	__cerror
diff --git a/lib/libc/arch/vax/sys/brk.S b/lib/libc/arch/vax/sys/brk.S
index b0122dddd91..6ddf50b260a 100644
--- a/lib/libc/arch/vax/sys/brk.S
+++ b/lib/libc/arch/vax/sys/brk.S
@@ -33,12 +33,12 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: brk.S,v 1.3 1998/05/17 10:06:30 niklas Exp $"
+	.asciz "$OpenBSD: brk.S,v 1.4 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
 
-	.globl	curbrk
+	.globl	__curbrk
 	.globl	minbrk
 ENTRY(_brk, 0)
 	jbr	ok
@@ -50,8 +50,8 @@ ENTRY(brk, 0)
 ok:
 	chmk	$ SYS_break
 	jcs	err
-	movl	4(ap),curbrk
+	movl	4(ap),__curbrk
 	clrl	r0
 	ret
 err:
-	jmp	cerror
+	jmp	__cerror
diff --git a/lib/libc/arch/vax/sys/cerror.S b/lib/libc/arch/vax/sys/cerror.S
index 67f256d1cc9..c1d6a81a9bb 100644
--- a/lib/libc/arch/vax/sys/cerror.S
+++ b/lib/libc/arch/vax/sys/cerror.S
@@ -33,13 +33,13 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: cerror.S,v 1.3 1996/08/19 08:18:58 tholo Exp $"
+	.asciz "$OpenBSD: cerror.S,v 1.4 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
 
 	.globl	_errno
-cerror:
+__cerror:
 	movl	r0,_errno
 	mnegl	$1,r0
 	mnegl	$1,r1
diff --git a/lib/libc/arch/vax/sys/exect.S b/lib/libc/arch/vax/sys/exect.S
index 8c04233d1fa..bd53807fcfd 100644
--- a/lib/libc/arch/vax/sys/exect.S
+++ b/lib/libc/arch/vax/sys/exect.S
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: exect.S,v 1.4 2001/08/23 21:58:41 miod Exp $"
+	.asciz "$OpenBSD: exect.S,v 1.5 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -42,4 +42,4 @@
 SYSENTRY(exect)
 	bispsw	$PSL_T
 	chmk	$ SYS_execve
-	jmp	cerror		# exect(file, argv, env)
+	jmp	__cerror	# exect(file, argv, env)
diff --git a/lib/libc/arch/vax/sys/sbrk.S b/lib/libc/arch/vax/sys/sbrk.S
index 5266bbe6ad1..a494b9c1d2f 100644
--- a/lib/libc/arch/vax/sys/sbrk.S
+++ b/lib/libc/arch/vax/sys/sbrk.S
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sbrk.S,v 1.4 2001/03/18 07:29:04 bjc Exp $"
+	.asciz "$OpenBSD: sbrk.S,v 1.5 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -41,22 +41,22 @@
 
 	.globl	_end
 	.globl	minbrk
-	.globl	curbrk
+	.globl	__curbrk
 
 	.data
 minbrk: .long	_end
-curbrk:	.long	_end
+__curbrk:.long	_end
 	.text
 
 ENTRY(sbrk, R3)
-	addl3	curbrk,4(ap),-(sp)
+	addl3	__curbrk,4(ap),-(sp)
 	pushl	$1
 	movl	ap,r3
 	movl	sp,ap
 	chmk	$ SYS_break
 	jcs 	err
-	movl	curbrk,r0
-	addl2	4(r3),curbrk
+	movl	__curbrk,r0
+	addl2	4(r3),__curbrk
 	ret
 err:
-	jmp	cerror
+	jmp	__cerror
diff --git a/lib/libc/arch/vax/sys/sigprocmask.S b/lib/libc/arch/vax/sys/sigprocmask.S
index f830bc1c08d..665fc5bbb6f 100644
--- a/lib/libc/arch/vax/sys/sigprocmask.S
+++ b/lib/libc/arch/vax/sys/sigprocmask.S
@@ -33,13 +33,13 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigprocmask.S,v 1.4 2001/08/23 21:58:41 miod Exp $"
+	.asciz "$OpenBSD: sigprocmask.S,v 1.5 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
 
 err:
-	jmp	cerror
+	jmp	__cerror
 
 SYSENTRY(sigprocmask)
 	tstl	8(ap)			# check new sigset pointer
diff --git a/lib/libc/arch/vax/sys/sigsuspend.S b/lib/libc/arch/vax/sys/sigsuspend.S
index 445f6e5db4a..7de8cb7e3f5 100644
--- a/lib/libc/arch/vax/sys/sigsuspend.S
+++ b/lib/libc/arch/vax/sys/sigsuspend.S
@@ -33,13 +33,13 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigsuspend.S,v 1.4 2001/08/23 21:58:41 miod Exp $"
+	.asciz "$OpenBSD: sigsuspend.S,v 1.5 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
 
 err:
-	jmp	cerror
+	jmp	__cerror
 
 SYSENTRY(sigsuspend)
 	movl	*4(ap),4(ap)		# indirect to mask arg
diff --git a/lib/libc/arch/vax/sys/syscall.S b/lib/libc/arch/vax/sys/syscall.S
index c8ad8befdcc..f8aac2fdaac 100644
--- a/lib/libc/arch/vax/sys/syscall.S
+++ b/lib/libc/arch/vax/sys/syscall.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: syscall.S,v 1.4 2001/08/23 21:58:41 miod Exp $"
+	.asciz "$OpenBSD: syscall.S,v 1.5 2002/11/05 00:37:09 miod Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -50,4 +50,4 @@ SYSENTRY(syscall)
 	jcs	1f
 	ret
 1:
-	jmp	cerror
+	jmp	__cerror