summaryrefslogtreecommitdiff
path: root/openbsd-compat/strlcat.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-10 16:05:37 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-10 16:05:37 +1100
commit80c0d7eb885d244d4745b55a392ee07b03e41676 (patch)
tree915996c59fb7b6dbbf518ff0042df0cb6f4b15e9 /openbsd-compat/strlcat.c
parente5a2b5288dea7f17373d97f4e81972de6935ae07 (diff)
- (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
of "register").
Diffstat (limited to 'openbsd-compat/strlcat.c')
-rw-r--r--openbsd-compat/strlcat.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
index 70f01cb2..8252f31a 100644
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@@ -1,6 +1,6 @@
/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
-/* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -21,10 +21,6 @@
#include "includes.h"
#ifndef HAVE_STRLCAT
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
@@ -38,9 +34,9 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp
size_t
strlcat(char *dst, const char *src, size_t siz)
{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */