From: Roland McGrath <roland@hack.frob.com>
Date: Sun, 14 Aug 2011 23:42:06 +0000 (-0700)
Subject: More warning patrol.
X-Git-Tag: glibc-2.15~405^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69f630971184cae39d578709089d175c4b743390;p=thirdparty%2Fglibc.git

More warning patrol.
---

diff --git a/ChangeLog b/ChangeLog
index 341deebefcf..456951833df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-14  Roland McGrath  <roland@hack.frob.com>
 
+	* string/strncat.c (STRNCAT): Use prototype definition.
+
 	* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
 	(locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
 	-Iprograms here.
diff --git a/string/strncat.c b/string/strncat.c
index 72d9d697ac8..0a3d4af7090 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;