diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:05:37 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:05:37 +1100 |
commit | 80c0d7eb885d244d4745b55a392ee07b03e41676 (patch) | |
tree | 915996c59fb7b6dbbf518ff0042df0cb6f4b15e9 /openbsd-compat | |
parent | e5a2b5288dea7f17373d97f4e81972de6935ae07 (diff) |
- (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
of "register").
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/strlcat.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c index 70f01cb2a..8252f31af 100644 --- a/openbsd-compat/strlcat.c +++ b/openbsd-compat/strlcat.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */ | 1 | /* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */ |
2 | 2 | ||
3 | /* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */ | 3 | /* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ |
4 | 4 | ||
5 | /* | 5 | /* |
6 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> | 6 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> |
@@ -21,10 +21,6 @@ | |||
21 | #include "includes.h" | 21 | #include "includes.h" |
22 | #ifndef HAVE_STRLCAT | 22 | #ifndef HAVE_STRLCAT |
23 | 23 | ||
24 | #if defined(LIBC_SCCS) && !defined(lint) | ||
25 | static char *rcsid = "$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $"; | ||
26 | #endif /* LIBC_SCCS and not lint */ | ||
27 | |||
28 | #include <sys/types.h> | 24 | #include <sys/types.h> |
29 | #include <string.h> | 25 | #include <string.h> |
30 | 26 | ||
@@ -38,9 +34,9 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp | |||
38 | size_t | 34 | size_t |
39 | strlcat(char *dst, const char *src, size_t siz) | 35 | strlcat(char *dst, const char *src, size_t siz) |
40 | { | 36 | { |
41 | register char *d = dst; | 37 | char *d = dst; |
42 | register const char *s = src; | 38 | const char *s = src; |
43 | register size_t n = siz; | 39 | size_t n = siz; |
44 | size_t dlen; | 40 | size_t dlen; |
45 | 41 | ||
46 | /* Find the end of dst and adjust bytes left but don't go past end */ | 42 | /* Find the end of dst and adjust bytes left but don't go past end */ |