diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-14 22:21:54 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-14 22:21:54 -0400 |
| commit | f3ed22607e8bf724b697c16876dbb76bb2418db6 (patch) | |
| tree | f496a9d8b5e41e850f613669bad6d066d0af0cf8 /string | |
| parent | a60df2c3db52b66fd3190c92ad9bc9b972e0d1fc (diff) | |
| parent | 69f630971184cae39d578709089d175c4b743390 (diff) | |
| download | glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.zip glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.gz glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'string')
| -rw-r--r-- | string/strncat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/string/strncat.c b/string/strncat.c index 72d9d69..0a3d4af 100644 --- a/string/strncat.c +++ b/string/strncat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991,1997,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,10 +29,7 @@ typedef char reg_char; #endif char * -STRNCAT (s1, s2, n) - char *s1; - const char *s2; - size_t n; +STRNCAT (char *s1, const char *s2, size_t n) { reg_char c; char *s = s1; |