remove SYSV and is68k ifdef's

[unix-history] / usr / src / usr.bin / make / str.c

diff --git a/usr/src/usr.bin/make/str.c b/usr/src/usr.bin/make/str.c
index bfad61a..50c9bf9 100644 (file)
--- a/usr/src/usr.bin/make/str.c
+++ b/usr/src/usr.bin/make/str.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)str.c      5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -34,10 +34,7 @@ static char sccsid[] = "@(#)str.c    5.2 (Berkeley) %G%";
  *                             the two strings, all this under the control
  *                             of the STR_ flags given as the third arg.
  *
  *                             the two strings, all this under the control
  *                             of the STR_ flags given as the third arg.
  *

- *     Str_New                 Duplicate a string and return the copy.
- *
- *     Str_FindSubstring       Find a substring within a string (from
- *                             original Sprite libc).
+ *     Str_FindSubstring       Find a substring within a string

  *
  *     Str_Match               Pattern match two strings.
  */
  *
  *     Str_Match               Pattern match two strings.
  */


@@ -108,30 +105,7 @@ Str_Concat (s1, s2, flags)
     }
     return (result);
 }
     }
     return (result);
 }

-\f
-/*-
- *-----------------------------------------------------------------------
- * Str_New  --
- *     Create a new unique copy of the given string
- *
- * Results:
- *     A pointer to the new copy of it
- *
- * Side Effects:
- *     None
- *-----------------------------------------------------------------------
- */
-char *
-Str_New (str)
-    char           *str;       /* string to duplicate */
-{
-    register char  *cp;                /* new space */

 
 

-    cp = malloc (strlen (str) + 1);
-    (void) strcpy (cp, str);
-    return (cp);
-}
-\f

 static char
 DoBackslash (c)
     char c;
 static char
 DoBackslash (c)
     char c;


@@ -145,7 +119,7 @@ DoBackslash (c)
        default:  return (c);
     }
 }
        default:  return (c);
     }
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Str_BreakString --
 /*-
  *-----------------------------------------------------------------------
  * Str_BreakString --


@@ -276,7 +250,7 @@ Str_BreakString (str, breaks, end, argcPtr)
     
     return av;
 }
     
     return av;
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Str_FreeVec --
 /*-
  *-----------------------------------------------------------------------
  * Str_FreeVec --


@@ -301,8 +275,7 @@ Str_FreeVec (count, vecPtr)
     }
     free (vecPtr);
 }
     }
     free (vecPtr);
 }

-#ifndef Sprite
-\f
+

 /*
  *----------------------------------------------------------------------
  * Str_FindSubstring --
 /*
  *----------------------------------------------------------------------
  * Str_FindSubstring --


@@ -352,8 +325,6 @@ Str_FindSubstring(string, substring)
     return (char *) NULL;
 }
 
     return (char *) NULL;
 }
 

-#endif /* !Sprite */
-\f

 /*
  *----------------------------------------------------------------------
  *
 /*
  *----------------------------------------------------------------------
  *