2009-09-22 Ozkan Sezer <sezeroz@gmail.com>

[pf3gnuchains/pf3gnuchains3x.git] / libiberty / strndup.c

diff --git a/libiberty/strndup.c b/libiberty/strndup.c
index 3d6b93d..9e9b4e2 100644 (file)
--- a/libiberty/strndup.c
+++ b/libiberty/strndup.c
@@ -15,8 +15,8 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
 
@@ -31,20 +31,14 @@ memory was available.  The result is always NUL terminated.
 */
 
 #include "ansidecl.h"
-#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
-#else
-#define size_t unsigned long
-#endif
 
-extern size_t  strlen PARAMS ((const char*));
-extern PTR     malloc PARAMS ((size_t));
-extern PTR     memcpy PARAMS ((PTR, const PTR, size_t));
+extern size_t  strlen (const char*);
+extern PTR     malloc (size_t);
+extern PTR     memcpy (PTR, const PTR, size_t);
 
 char *
-strndup(s, n)
-     const char *s;
-     size_t n;
+strndup (const char *s, size_t n)
 {
   char *result;
   size_t len = strlen (s);
@@ -52,10 +46,10 @@ strndup(s, n)
   if (n < len)
     len = n;
 
-  result = malloc (len + 1);
+  result = (char *) malloc (len + 1);
   if (!result)
     return 0;
 
   result[len] = '\0';
-  return memcpy (result, s, len);
+  return (char *) memcpy (result, s, len);
 }