Changeset 24 for branches/FREEBSD/src/kmk/str.c

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/str.c (modified) (11 diffs)

branches/FREEBSD/src/kmk/str.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)str.c    5.8 (Berkeley) 6/1/90
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/str.c,v 1.25 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)str.c       5.8 (Berkeley) 6/1/90";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/str.c,v 1.12.2.1 2002/06/17 04:30:48 jmallett Exp $";
+#endif
+#endif /* not lint */
 
 #include "make.h"
@@ -53 +57 @@
  */
 void
-str_init(void)
+str_init()
 {
     char *p1;
@@ -67 +71 @@
  */
 void
-str_end(void)
+str_end()
 {
     if (argv) {
         if (argv[0])
             free(argv[0]);
-        free(argv);
+        free((Address) argv);
     }
     if (buffer)
@@ -87 +91 @@
  */
 char *
-str_concat(char *s1, char *s2, int flags)
-{
-        int len1, len2;
-        char *result;
+str_concat(s1, s2, flags)
+        char *s1, *s2;
+        int flags;
+{
+        register int len1, len2;
+        register char *result;
 
         /* get the length of both strings */
@@ -116 +122 @@
         /* free original strings */
         if (flags & STR_DOFREE) {
-                (void)efree(s1);
-                (void)efree(s2);
+                (void)free(s1);
+                (void)free(s2);
         }
         return(result);
@@ -133 +139 @@
  */
 char **
-brk_string(char *str, int *store_argc, Boolean expand)
-{
-        int argc, ch;
-        char inquote, *p, *start, *t;
+brk_string(str, store_argc, expand)
+        register char *str;
+        int *store_argc;
+        Boolean expand;
+{
+        register int argc, ch;
+        register char inquote, *p, *start, *t;
         int len;
 
@@ -237 +246 @@
                                 ch = '\t';
                                 break;
-                        default:
-                                break;
-                        }
-                        break;
-                default:
+                        }
                         break;
                 }
@@ -262 +267 @@
  *
  * Side effects: None.
- *
- * XXX should be strstr(3).
  */
 char *
-Str_FindSubstring(char *string, char *substring)
-{
-        char *a, *b;
+Str_FindSubstring(string, substring)
+        register char *string;          /* String to search. */
+        char *substring;                /* Substring to find in string */
+{
+        register char *a, *b;
 
         /*
@@ -303 +308 @@
  */
 int
-Str_Match(char *string, char *pattern)
+Str_Match(string, pattern)
+        register char *string;          /* String */
+        register char *pattern;         /* Pattern */
 {
         char c2;
@@ -406 +413 @@
  */
 char *
-Str_SYSVMatch(char *word, char *pattern, int *len)
+Str_SYSVMatch(word, pattern, len)
+    char        *word;          /* Word to examine */
+    char        *pattern;       /* Pattern to examine against */
+    int         *len;           /* Number of characters to substitute */
 {
     char *p = pattern;
@@ -469 +479 @@
  */
 void
-Str_SYSVSubst(Buffer buf, char *pat, char *src, int len)
+Str_SYSVSubst(buf, pat, src, len)
+    Buffer buf;
+    char *pat;
+    char *src;
+    int   len;
 {
     char *m;