From 200ad8d9bd537cc64038f827311dab4783f4ed14 Mon Sep 17 00:00:00 2001
From: jtc <jtc@NetBSD.org>
Date: Mon, 16 Aug 1993 17:06:27 +0000
Subject: [PATCH] Don't include "DEFS.h" more than once. Added .asciz rcsid's
 to all files.

---
 lib/libc/i386/string/bcmp.s    | 8 +++++---
 lib/libc/i386/string/bcopy.s   | 4 ++--
 lib/libc/i386/string/bzero.s   | 8 +++++---
 lib/libc/i386/string/ffs.s     | 6 +++++-
 lib/libc/i386/string/index.s   | 6 +++++-
 lib/libc/i386/string/memchr.s  | 6 +++++-
 lib/libc/i386/string/memcmp.s  | 8 +++++---
 lib/libc/i386/string/memmove.s | 4 ++--
 lib/libc/i386/string/memset.s  | 8 +++++---
 lib/libc/i386/string/rindex.s  | 7 +++++--
 lib/libc/i386/string/strcat.s  | 6 +++++-
 lib/libc/i386/string/strchr.s  | 6 +++++-
 lib/libc/i386/string/strcmp.s  | 6 +++++-
 lib/libc/i386/string/strcpy.s  | 6 +++++-
 lib/libc/i386/string/strlen.s  | 6 +++++-
 lib/libc/i386/string/strncmp.s | 6 +++++-
 lib/libc/i386/string/strrchr.s | 6 +++++-
 17 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/lib/libc/i386/string/bcmp.s b/lib/libc/i386/string/bcmp.s
index 0707182eb7c0..ff46706f1df1 100644
--- a/lib/libc/i386/string/bcmp.s
+++ b/lib/libc/i386/string/bcmp.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: bcmp.s,v 1.2 1993/08/02 17:49:43 mycroft Exp $
+ *	$Id: bcmp.s,v 1.3 1993/08/16 17:06:27 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: bcmp.s,v 1.3 1993/08/16 17:06:27 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
@@ -43,8 +47,6 @@
  * XXX should compare by words
  */
 
-#include "DEFS.h"
-
 ENTRY(bcmp)
 	pushl	%edi
 	pushl	%esi
diff --git a/lib/libc/i386/string/bcopy.s b/lib/libc/i386/string/bcopy.s
index ba946a49755f..06a74e2b470b 100644
--- a/lib/libc/i386/string/bcopy.s
+++ b/lib/libc/i386/string/bcopy.s
@@ -32,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bcopy.s,v 1.5 1993/08/02 17:49:44 mycroft Exp $
+ *	$Id: bcopy.s,v 1.6 1993/08/16 17:06:29 jtc Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-	.asciz "$Id $"
+	.asciz "$Id: bcopy.s,v 1.6 1993/08/16 17:06:29 jtc Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/bzero.s b/lib/libc/i386/string/bzero.s
index 6019a0f14f5a..9881d300a3d9 100644
--- a/lib/libc/i386/string/bzero.s
+++ b/lib/libc/i386/string/bzero.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: bzero.s,v 1.5 1993/08/02 17:49:45 mycroft Exp $
+ *	$Id: bzero.s,v 1.6 1993/08/16 17:06:29 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: bzero.s,v 1.6 1993/08/16 17:06:29 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
@@ -40,8 +44,6 @@
  *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
  */
 
-#include "DEFS.h"
-
 ENTRY(bzero)
 	pushl	%edi
 	pushl	%ebx
diff --git a/lib/libc/i386/string/ffs.s b/lib/libc/i386/string/ffs.s
index 24e376b6164e..cd0322cf217a 100644
--- a/lib/libc/i386/string/ffs.s
+++ b/lib/libc/i386/string/ffs.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ffs.s,v 1.3 1993/08/02 17:49:46 mycroft Exp $
+ *	$Id: ffs.s,v 1.4 1993/08/16 17:06:30 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: ffs.s,v 1.4 1993/08/16 17:06:30 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/index.s b/lib/libc/i386/string/index.s
index 49a826d72b1c..585e8a1a17ae 100644
--- a/lib/libc/i386/string/index.s
+++ b/lib/libc/i386/string/index.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: index.s,v 1.3 1993/08/02 17:49:47 mycroft Exp $
+ *	$Id: index.s,v 1.4 1993/08/16 17:06:31 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: index.s,v 1.4 1993/08/16 17:06:31 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/memchr.s b/lib/libc/i386/string/memchr.s
index eee600e78d66..0e3b1c4b2897 100644
--- a/lib/libc/i386/string/memchr.s
+++ b/lib/libc/i386/string/memchr.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: memchr.s,v 1.2 1993/08/02 17:49:47 mycroft Exp $
+ *	$Id: memchr.s,v 1.3 1993/08/16 17:06:32 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: memchr.s,v 1.3 1993/08/16 17:06:32 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/memcmp.s b/lib/libc/i386/string/memcmp.s
index 0f6055d4a720..6aef30fc412c 100644
--- a/lib/libc/i386/string/memcmp.s
+++ b/lib/libc/i386/string/memcmp.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: memcmp.s,v 1.2 1993/08/02 17:49:48 mycroft Exp $
+ *	$Id: memcmp.s,v 1.3 1993/08/16 17:06:33 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: memcmp.s,v 1.3 1993/08/16 17:06:33 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
@@ -43,8 +47,6 @@
  * XXX should compare by words
  */
 
-#include "DEFS.h"
-
 ENTRY(memcmp)
 	pushl	%edi
 	pushl	%esi
diff --git a/lib/libc/i386/string/memmove.s b/lib/libc/i386/string/memmove.s
index a983ba6526e7..e433235bf1a9 100644
--- a/lib/libc/i386/string/memmove.s
+++ b/lib/libc/i386/string/memmove.s
@@ -32,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: memmove.s,v 1.6 1993/08/02 17:49:49 mycroft Exp $
+ *	$Id: memmove.s,v 1.7 1993/08/16 17:06:34 jtc Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-	.asciz "$Id $"
+        .asciz "$Id: memmove.s,v 1.7 1993/08/16 17:06:34 jtc Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memset.s b/lib/libc/i386/string/memset.s
index 4a0964b502d0..9def702174ef 100644
--- a/lib/libc/i386/string/memset.s
+++ b/lib/libc/i386/string/memset.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: memset.s,v 1.2 1993/08/02 17:49:50 mycroft Exp $
+ *	$Id: memset.s,v 1.3 1993/08/16 17:06:35 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: memset.s,v 1.3 1993/08/16 17:06:35 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
@@ -41,8 +45,6 @@
  *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
  */
 
-#include "DEFS.h"
-
 ENTRY(memset)
 	pushl	%edi
 	pushl	%ebx
diff --git a/lib/libc/i386/string/rindex.s b/lib/libc/i386/string/rindex.s
index a51e04081dba..7646fbf0b04d 100644
--- a/lib/libc/i386/string/rindex.s
+++ b/lib/libc/i386/string/rindex.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rindex.s,v 1.3 1993/08/02 17:49:51 mycroft Exp $
+ *	$Id: rindex.s,v 1.4 1993/08/16 17:06:36 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: rindex.s,v 1.4 1993/08/16 17:06:36 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
@@ -46,7 +50,6 @@
  *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
  */
  
-
 ENTRY(rindex)
 	pushl	%ebx
 	movl	8(%esp),%edx
diff --git a/lib/libc/i386/string/strcat.s b/lib/libc/i386/string/strcat.s
index 5d13b72507d5..7966b3da23ff 100644
--- a/lib/libc/i386/string/strcat.s
+++ b/lib/libc/i386/string/strcat.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strcat.s,v 1.4 1993/08/02 17:49:52 mycroft Exp $
+ *	$Id: strcat.s,v 1.5 1993/08/16 17:06:37 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strcat.s,v 1.5 1993/08/16 17:06:37 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strchr.s b/lib/libc/i386/string/strchr.s
index bda92758b79f..471e8b8c13d8 100644
--- a/lib/libc/i386/string/strchr.s
+++ b/lib/libc/i386/string/strchr.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strchr.s,v 1.3 1993/08/02 17:49:53 mycroft Exp $
+ *	$Id: strchr.s,v 1.4 1993/08/16 17:06:38 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strchr.s,v 1.4 1993/08/16 17:06:38 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strcmp.s b/lib/libc/i386/string/strcmp.s
index ba12668fadf3..d79ab98c05c0 100644
--- a/lib/libc/i386/string/strcmp.s
+++ b/lib/libc/i386/string/strcmp.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strcmp.s,v 1.3 1993/08/02 17:49:53 mycroft Exp $
+ *	$Id: strcmp.s,v 1.4 1993/08/16 17:06:39 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strcmp.s,v 1.4 1993/08/16 17:06:39 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strcpy.s b/lib/libc/i386/string/strcpy.s
index fd3c4868e435..3bcc90e574b0 100644
--- a/lib/libc/i386/string/strcpy.s
+++ b/lib/libc/i386/string/strcpy.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strcpy.s,v 1.3 1993/08/02 17:49:54 mycroft Exp $
+ *	$Id: strcpy.s,v 1.4 1993/08/16 17:06:40 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strcpy.s,v 1.4 1993/08/16 17:06:40 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strlen.s b/lib/libc/i386/string/strlen.s
index 5cabcd94ddbc..b1a267a58373 100644
--- a/lib/libc/i386/string/strlen.s
+++ b/lib/libc/i386/string/strlen.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strlen.s,v 1.2 1993/08/02 17:49:55 mycroft Exp $
+ *	$Id: strlen.s,v 1.3 1993/08/16 17:06:41 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strlen.s,v 1.3 1993/08/16 17:06:41 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strncmp.s b/lib/libc/i386/string/strncmp.s
index 55bc40102bb0..fc270504a38f 100644
--- a/lib/libc/i386/string/strncmp.s
+++ b/lib/libc/i386/string/strncmp.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strncmp.s,v 1.3 1993/08/02 17:49:56 mycroft Exp $
+ *	$Id: strncmp.s,v 1.4 1993/08/16 17:06:42 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strncmp.s,v 1.4 1993/08/16 17:06:42 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*
diff --git a/lib/libc/i386/string/strrchr.s b/lib/libc/i386/string/strrchr.s
index 25283bdfb8a2..bdb9c0eae091 100644
--- a/lib/libc/i386/string/strrchr.s
+++ b/lib/libc/i386/string/strrchr.s
@@ -27,9 +27,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strrchr.s,v 1.3 1993/08/02 17:49:57 mycroft Exp $
+ *	$Id: strrchr.s,v 1.4 1993/08/16 17:06:43 jtc Exp $
  */
 
+#if defined(LIBC_RCS) && !defined(lint)
+        .asciz "$Id: strrchr.s,v 1.4 1993/08/16 17:06:43 jtc Exp $"
+#endif /* LIBC_RCS and not lint */
+
 #include "DEFS.h"
 
 /*