diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-15 06:10:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-15 06:10:42 +0000 |
| commit | e749545a3e4cb7664c0348067c49aa0d89caf70c (patch) | |
| tree | dbb4b6c8cafcaea0f1232a33be0cc6b1bc323873 /libstore/set.c | |
| parent | 5a2dc36112ef2a40bdd2a6187d998c3db4ad8f95 (diff) | |
| download | hurd-e749545a3e4cb7664c0348067c49aa0d89caf70c.tar.gz hurd-e749545a3e4cb7664c0348067c49aa0d89caf70c.tar.bz2 hurd-e749545a3e4cb7664c0348067c49aa0d89caf70c.zip | |
2001-08-12 Neal H Walfield <neal@cs.uml.edu>
* set.c: Do not include <malloc.h>.
Include <stdlib.h>, <errno.h> and <mach.h>.
(store_set_runs): Use memcpy, not bcopy.
(store_set_name): Use strdup, not a strlen, malloc and strcpy.
* zero.c (zero_read): When checking if mmap failed, compare
against MAP_FAILED, not -1.
Use memset, not bzero.
Diffstat (limited to 'libstore/set.c')
| -rw-r--r-- | libstore/set.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libstore/set.c b/libstore/set.c index 26a26075..a1682539 100644 --- a/libstore/set.c +++ b/libstore/set.c @@ -1,7 +1,7 @@ /* Setting various store fields - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - Written by Miles Bader <miles@gnu.ai.mit.edu> + Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. + Written by Miles Bader <miles@gnu.org> This file is part of the GNU Hurd. The GNU Hurd is free software; you can redistribute it and/or @@ -18,8 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#include <malloc.h> +#include <stdlib.h> #include <string.h> +#include <errno.h> +#include <mach.h> #include "store.h" @@ -37,7 +39,7 @@ store_set_runs (struct store *store, if (store->runs) free (store->runs); - bcopy (runs, copy, size); + memcpy (copy, runs, size); store->runs = copy; store->num_runs = num_runs; @@ -51,7 +53,7 @@ store_set_runs (struct store *store, error_t store_set_name (struct store *store, const char *name) { - char *copy = malloc (strlen (name) + 1); + char *copy = strdup (name); if (!copy) return ENOMEM; @@ -59,7 +61,6 @@ store_set_name (struct store *store, const char *name) if (store->name) free (store->name); - strcpy (copy, name); store->name = copy; return 0; |