diff options
Diffstat (limited to 'openbsd-compat/strsep.c')
-rw-r--r-- | openbsd-compat/strsep.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c index d0afc44ae..b13671343 100644 --- a/openbsd-compat/strsep.c +++ b/openbsd-compat/strsep.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $ */ | 1 | /* $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */ |
2 | 2 | ||
3 | /*- | 3 | /*- |
4 | * Copyright (c) 1990, 1993 | 4 | * Copyright (c) 1990, 1993 |
@@ -12,11 +12,7 @@ | |||
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. |
15 | * 3. All advertising materials mentioning features or use of this software | 15 | * 3. Neither the name of the University nor the names of its contributors |
16 | * must display the following acknowledgement: | ||
17 | * This product includes software developed by the University of | ||
18 | * California, Berkeley and its contributors. | ||
19 | * 4. Neither the name of the University nor the names of its contributors | ||
20 | * may be used to endorse or promote products derived from this software | 16 | * may be used to endorse or promote products derived from this software |
21 | * without specific prior written permission. | 17 | * without specific prior written permission. |
22 | * | 18 | * |
@@ -44,7 +40,7 @@ | |||
44 | #if 0 | 40 | #if 0 |
45 | static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; | 41 | static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; |
46 | #else | 42 | #else |
47 | static char *rcsid = "$OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $"; | 43 | static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $"; |
48 | #endif | 44 | #endif |
49 | #endif /* LIBC_SCCS and not lint */ | 45 | #endif /* LIBC_SCCS and not lint */ |
50 | 46 | ||
@@ -62,9 +58,9 @@ static char *rcsid = "$OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $ | |||
62 | char * | 58 | char * |
63 | strsep(char **stringp, const char *delim) | 59 | strsep(char **stringp, const char *delim) |
64 | { | 60 | { |
65 | register char *s; | 61 | char *s; |
66 | register const char *spanp; | 62 | const char *spanp; |
67 | register int c, sc; | 63 | int c, sc; |
68 | char *tok; | 64 | char *tok; |
69 | 65 | ||
70 | if ((s = *stringp) == NULL) | 66 | if ((s = *stringp) == NULL) |