s_strn{cpy,cat} are no longer used; remove them. also, kill NOTUSED.

ok tedu@

2 files changed, 4 insertions, 59 deletions

diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index 5d6838f95d0..cb9ef9175df 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.9 2003/05/12 20:48:41 jsyn Exp $	*/
+/*	$OpenBSD: extern.h,v 1.10 2003/05/12 20:54:49 jsyn Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $	*/
 
 /*-
@@ -314,10 +314,6 @@ void	showall(Char **, struct command *);
 #ifdef SHORT_STRINGS
 Char	 *s_strchr(Char *, int);
 Char	 *s_strrchr(Char *, int);
-#ifdef NOTUSED
-Char	 *s_strncat(Char *, Char *, size_t);
-#endif
-Char	 *s_strncpy(Char *, Char *, size_t);
 Char	 *s_strspl(Char *, Char *);
 size_t	  s_strlen(Char *);
 int	  s_strcmp(Char *, Char *);
@@ -329,6 +325,6 @@ Char	 *str2short(char *);
 Char	**blk2short(char **);
 char	 *short2str(Char *);
 char	**short2blk(Char **);
-#endif
+#endif /* SHORT_STRINGS */
 char	 *short2qstr(Char *);
 char	 *vis_str(Char *);
diff --git a/bin/csh/str.c b/bin/csh/str.c
index f0807a52610..d3f63ccfea2 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: str.c,v 1.10 2003/04/30 21:06:10 vincent Exp $	*/
+/*	$OpenBSD: str.c,v 1.11 2003/05/12 20:54:49 jsyn Exp $	*/
 /*	$NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: str.c,v 1.10 2003/04/30 21:06:10 vincent Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.11 2003/05/12 20:54:49 jsyn Exp $";
 #endif
 #endif /* not lint */
 
@@ -222,57 +222,6 @@ s_strlcat(dst, src, siz)
 }
 
 Char   *
-s_strncpy(dst, src, n)
-    register Char *dst, *src;
-    register size_t n;
-{
-    register Char *sdst;
-
-    if (n == 0)
-	return(dst);
-
-    sdst = dst;
-    do
-	if ((*dst++ = *src++) == '\0') {
-	    while (--n != 0)
-		*dst++ = '\0';
-	    return(sdst);
-	}
-    while (--n != 0)
-	;
-    return (sdst);
-}
-
-#ifdef NOTUSED
-Char   *
-s_strncat(dst, src, n)
-    register Char *dst, *src;
-    register size_t n;
-{
-    register Char *sdst;
-
-    if (n == 0)
-	return (dst);
-
-    sdst = dst;
-
-    while (*dst++)
-	continue;
-    --dst;
-
-    do
-	if ((*dst++ = *src++) == '\0')
-	    return(sdst);
-    while (--n != 0)
-	continue;
-
-    *dst = '\0';
-    return (sdst);
-}
-
-#endif
-
-Char   *
 s_strchr(str, ch)
     register Char *str;
     int ch;