From 1c5c40f638cf66cced5ed614a3e937a3d6be79f8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 23 Aug 2011 12:03:55 +0000 Subject: =?UTF-8?q?2011-08-23=20=20Ralf=20Cors=C3=A9pius=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * libc/stdlib/putenv_r.c: Use "strchr" instead of obsolete "index". * libc/stdlib/setenv_r.c: Use "memcpy" instead of obsolete "bcopy". --- newlib/ChangeLog | 5 +++++ newlib/libc/stdlib/putenv_r.c | 2 +- newlib/libc/stdlib/setenv_r.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 3991a837f..f3f6a96c8 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2011-08-23 Ralf Corsépius + + * libc/stdlib/putenv_r.c: Use "strchr" instead of obsolete "index". + * libc/stdlib/setenv_r.c: Use "memcpy" instead of obsolete "bcopy". + 2011-08-23 Ralf Corsépius * libc/misc/ffs.c, libc/string/bcmp.c, libc/string/bcopy.c, diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c index 9ba626025..a0f476721 100644 --- a/newlib/libc/stdlib/putenv_r.c +++ b/newlib/libc/stdlib/putenv_r.c @@ -43,7 +43,7 @@ _DEFUN (_putenv_r, (reent_ptr, str), if (!p) return 1; - if (!(equal = index (p, '='))) + if (!(equal = strchr (p, '='))) { (void) _free_r (reent_ptr, p); return 1; diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c index d73ba3949..f9ff2c1cd 100644 --- a/newlib/libc/stdlib/setenv_r.c +++ b/newlib/libc/stdlib/setenv_r.c @@ -110,7 +110,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite), ENV_UNLOCK; return (-1); } - bcopy ((char *) *p_environ, (char *) P, cnt * sizeof (char *)); + memcpy((char *) P,(char *) *p_environ, cnt * sizeof (char *)); *p_environ = P; } (*p_environ)[cnt + 1] = NULL; -- cgit v1.2.3