summaryrefslogtreecommitdiff
path: root/libstore
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1997-06-20 05:08:16 +0000
committerMiles Bader <miles@gnu.org>1997-06-20 05:08:16 +0000
commit3d8dfe9d6c0cb5015b44acdf3b6dab1e247b6c3e (patch)
tree432a70d5cc360922469434168c1b860e822c926f /libstore
parent80c542180fe8f290870b811a714eeb82d7ad0c07 (diff)
(store_remap_create):
Use _store_create instead of _make_store. Update FSF address.
Diffstat (limited to 'libstore')
-rw-r--r--libstore/remap.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libstore/remap.c b/libstore/remap.c
index c2147a09..5841457b 100644
--- a/libstore/remap.c
+++ b/libstore/remap.c
@@ -1,9 +1,7 @@
/* Block address translation
- Copyright (C) 1996 Free Software Foundation, Inc.
-
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
-
This file is part of the GNU Hurd.
The GNU Hurd is free software; you can redistribute it and/or
@@ -18,7 +16,7 @@
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 <hurd/fs.h>
@@ -105,16 +103,16 @@ store_remap_create (struct store *source,
const struct store_run *runs, size_t num_runs,
int flags, struct store **store)
{
- error_t err;
-
- *store = _make_store (&store_remap_class, MACH_PORT_NULL, flags | source->flags,
- source->block_size, runs, num_runs, 0);
- if (! *store)
- return ENOMEM;
+ error_t err =
+ _store_create (&store_remap_class, MACH_PORT_NULL, flags | source->flags,
+ source->block_size, runs, num_runs, 0, store);
- err = store_set_children (*store, &source, 1);
- if (err)
- store_free (*store);
+ if (! err)
+ {
+ err = store_set_children (*store, &source, 1);
+ if (err)
+ store_free (*store);
+ }
return err;
}