diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-02-22 13:27:47 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-02-22 13:27:47 +0000 |
| commit | 527682eb5c14b136c2ac00169328a84bf8545526 (patch) | |
| tree | 248340d44a86ac125da6bb6e3f98c04adb2e8d27 /sbin/disklabel | |
| parent | 27b6993c909880bdcdee4554a34a31316d68d9d2 (diff) | |
Revert mountpoints tweaking. Needs much more serious surgery than time
permits before release, and is pointless without other following diffs
to justify it that will not make release.
Should fix segfault's during install reported by Rod Whitworth on tech@
Diffstat (limited to 'sbin/disklabel')
| -rw-r--r-- | sbin/disklabel/editor.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 1ab3f7f9f59..f6d7cf35753 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.281 2014/02/16 00:04:32 krw Exp $ */ +/* $OpenBSD: editor.c,v 1.282 2014/02/22 13:27:46 krw Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -138,7 +138,6 @@ void set_bounds(struct disklabel *); void set_duid(struct disklabel *); struct diskchunk *free_chunks(struct disklabel *); void mpcopy(char **, char **); -void mpfree(char **); int micmp(const void *, const void *); int mpequal(char **, char **); int get_bsize(struct disklabel *, int); @@ -501,9 +500,9 @@ editor(int f) } } done: - mpfree(omountpoints); - mpfree(origmountpoints); - mpfree(tmpmountpoints); + free(omountpoints); + free(origmountpoints); + free(tmpmountpoints); if (disk_geop) free(disk_geop); return(error); @@ -1897,20 +1896,6 @@ mpsave(struct disklabel *lp) } } -void -mpfree(char **mp) -{ - int part; - - if (mp == NULL) - return; - - for (part == 0; part < MAXPARTITIONS; part++) - free(mp[part]); - - free(mp); -} - int get_offset(struct disklabel *lp, int partno) { |