oops

6 files changed, 6 insertions, 31 deletions

diff --git a/lib/libc/arch/i386/string/strcat.S b/lib/libc/arch/i386/string/strcat.S
index 37f766a7231..fbb4dcec147 100644
--- a/lib/libc/arch/i386/string/strcat.S
+++ b/lib/libc/arch/i386/string/strcat.S
@@ -5,14 +5,9 @@
 
 #include <machine/asm.h>
 
-#APP
-	.stabs "warning: strcat() is almost always misused, consider using strlcat()",30,0,0,0
-	.stabs "_strcat",1,0,0,0
-#NO_APP
-
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: strcat.S,v 1.3 2003/06/11 21:03:10 deraadt Exp $"
+	.asciz "$OpenBSD: strcat.S,v 1.4 2003/06/11 21:07:03 deraadt Exp $"
 #endif
 
 /*
diff --git a/lib/libc/arch/i386/string/strcpy.S b/lib/libc/arch/i386/string/strcpy.S
index 86632c42e1c..5e819556ad4 100644
--- a/lib/libc/arch/i386/string/strcpy.S
+++ b/lib/libc/arch/i386/string/strcpy.S
@@ -5,14 +5,9 @@
 
 #include <machine/asm.h>
 
-#APP
-	.stabs "warning: strcpy() is almost always misused, consider using strlcpy()",30,0,0,0
-	.stabs "_strcpy",1,0,0,0
-#NO_APP
-
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: strcpy.S,v 1.3 2003/06/11 21:03:10 deraadt Exp $"
+	.asciz "$OpenBSD: strcpy.S,v 1.4 2003/06/11 21:07:03 deraadt Exp $"
 #endif
 
 /*
diff --git a/lib/libc/arch/m68k/string/strcat.S b/lib/libc/arch/m68k/string/strcat.S
index e988ccf79cc..d809086ec23 100644
--- a/lib/libc/arch/m68k/string/strcat.S
+++ b/lib/libc/arch/m68k/string/strcat.S
@@ -33,14 +33,9 @@
 
 #include "DEFS.h"
 
-#APP
-	.stabs "warning: strcat() is almost always misused, consider using strlcat()",30,0,0,0
-	.stabs "_strcat",1,0,0,0
-#NO_APP
-
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: strcat.S,v 1.4 2003/06/11 21:03:10 deraadt Exp $"
+	.asciz "$OpenBSD: strcat.S,v 1.5 2003/06/11 21:06:33 deraadt Exp $"
 #endif /* LIBC_SCCS */
 
 ENTRY(strcat)
diff --git a/lib/libc/arch/m68k/string/strcpy.S b/lib/libc/arch/m68k/string/strcpy.S
index a4962db432d..7c175322fc3 100644
--- a/lib/libc/arch/m68k/string/strcpy.S
+++ b/lib/libc/arch/m68k/string/strcpy.S
@@ -33,14 +33,9 @@
 
 #include "DEFS.h"
 
-#APP
-	.stabs "warning: strcpy() is almost always misused, consider using strlcpy()",30,0,0,0
-	.stabs "_strcpy",1,0,0,0
-#NO_APP
-
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: strcpy.S,v 1.5 2003/06/11 21:03:10 deraadt Exp $"
+	.asciz "$OpenBSD: strcpy.S,v 1.6 2003/06/11 21:06:33 deraadt Exp $"
 #endif /* LIBC_SCCS */
 
 ENTRY(strcpy)
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index ebeda39755a..ba8cc70fe04 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -31,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sprintf.c,v 1.7 2003/06/11 21:03:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprintf.c,v 1.8 2003/06/11 21:05:09 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -39,8 +39,6 @@ static char rcsid[] = "$OpenBSD: sprintf.c,v 1.7 2003/06/11 21:03:10 deraadt Exp
 #include <limits.h>
 #include "local.h"
 
-__warn_references(sprintf, "warning: sprintf() is often misused, please use snprintf()");
-
 int
 sprintf(char *str, char const *fmt, ...)
 {
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index e3c099d0fb4..97010c5fc6e 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -31,15 +31,12 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vsprintf.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vsprintf.c,v 1.7 2003/06/11 21:05:09 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include <limits.h>
 
-__warn_references(vsprintf,
-    "warning: vsprintf() is often misused, please use vsnprintf()");
-
 int
 vsprintf(str, fmt, ap)
 	char *str;