diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdmalloc.c | 10 | ||||
| -rw-r--r-- | hurd/path-lookup.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c index 25bf876aa2..4839d98535 100644 --- a/hurd/hurdmalloc.c +++ b/hurd/hurdmalloc.c @@ -1,8 +1,6 @@ #include <stdlib.h> #include <string.h> -#define bcopy(s,d,n) memcpy ((d), (s), (n)) /* No overlap handling. */ - #include "hurdmalloc.h" /* XXX see that file */ #include <mach.h> @@ -37,6 +35,10 @@ /* * HISTORY * $Log$ + * Revision 1.15 2001/09/19 03:04:09 drepper + * (bcopy): Removed. + * (realloc): Replace bcopy with memcpy. + * * Revision 1.14 2001/04/01 05:03:14 roland * 2001-03-11 Roland McGrath <roland@frob.com> * @@ -422,8 +424,8 @@ realloc(old_base, new_size) */ new_base = malloc(new_size); if (new_base) - bcopy(old_base, new_base, - (int) (old_size < new_size ? old_size : new_size)); + memcpy (new_base, old_base, + (int) (old_size < new_size ? old_size : new_size)); if (new_base || new_size == 0) /* Free OLD_BASE, but only if the malloc didn't fail. */ diff --git a/hurd/path-lookup.c b/hurd/path-lookup.c index 19434b61a4..5c51d390f5 100644 --- a/hurd/path-lookup.c +++ b/hurd/path-lookup.c @@ -55,10 +55,10 @@ file_name_path_scan (const char *file_name, const char *path, if (pfx_len == 0) pfxed_name[pfx_len++] = '.'; else - bcopy (path, pfxed_name, pfx_len); + memcpy (pfxed_name, path, pfx_len); if (pfxed_name[pfx_len - 1] != '/') pfxed_name[pfx_len++] = '/'; - bcopy (file_name, pfxed_name + pfx_len, file_name_len + 1); + memcpy (pfxed_name + pfx_len, file_name, file_name_len + 1); err = (*fun)(pfxed_name); if (err == 0) |