diff options
Diffstat (limited to 'libstore/set.c')
| -rw-r--r-- | libstore/set.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libstore/set.c b/libstore/set.c index 479184d4..b9ff4f41 100644 --- a/libstore/set.c +++ b/libstore/set.c @@ -1,9 +1,7 @@ /* Setting various store fields - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - - Written by Miles Bader <miles@gnu.ai.mit.edu> - + Copyright (C) 1995,96,97,2001,02 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,16 +16,19 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + 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" /* Set STORE's current runs list to (a copy of) RUNS and NUM_RUNS. */ error_t -store_set_runs (struct store *store, const struct store_run *runs, unsigned num_runs) +store_set_runs (struct store *store, + const struct store_run *runs, size_t num_runs) { unsigned size = num_runs * sizeof (struct store_run); struct store_run *copy = malloc (size); @@ -38,7 +39,7 @@ store_set_runs (struct store *store, const struct store_run *runs, unsigned num_ if (store->runs) free (store->runs); - bcopy (runs, copy, size); + memcpy (copy, runs, size); store->runs = copy; store->num_runs = num_runs; @@ -52,7 +53,7 @@ store_set_runs (struct store *store, const struct store_run *runs, unsigned num_ 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; @@ -60,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; @@ -70,7 +70,7 @@ store_set_name (struct store *store, const char *name) source from which it was created. */ void store_close_source (struct store *store) { - if (store->source) + if (store->source != MACH_PORT_NULL) { mach_port_deallocate (mach_task_self (), store->source); store->source = MACH_PORT_NULL; |