summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/cdrom.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-12-12 08:33:38 +0000
committerjkh <jkh@FreeBSD.org>1996-12-12 08:33:38 +0000
commit61be8f66cf7d37967637bc2fac3191f514c220de (patch)
treee55bd7f41e2d91b60c93866ae2102986a547ec2d /usr.sbin/sysinstall/cdrom.c
parent29d7f1c31842286de505e626253394a7df40547d (diff)
downloadFreeBSD-src-61be8f66cf7d37967637bc2fac3191f514c220de.zip
FreeBSD-src-61be8f66cf7d37967637bc2fac3191f514c220de.tar.gz
Undo one of my memory optimization hacks - it actually made things more
complicated.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
-rw-r--r--usr.sbin/sysinstall/cdrom.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 8324e65..69b415b 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: cdrom.c,v 1.27 1996/12/11 09:34:54 jkh Exp $
+ * $Id: cdrom.c,v 1.28 1996/12/11 18:23:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -74,7 +74,7 @@ mediaInitCDROM(Device *dev)
args.fspec = dev->devname;
args.flags = 0;
- cd_attr = safe_malloc(sizeof(Attribs) * MAX_ATTRIBS);
+ cd_attr = alloca(sizeof(Attribs) * MAX_ATTRIBS);
cp = NULL;
dontRead = FALSE;
/* If this cdrom's not already mounted or can't be mounted, yell */
@@ -116,7 +116,6 @@ mediaInitCDROM(Device *dev)
"to set the boot floppy version string to match that of the CD\n"
"before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));
}
- attr_free(cd_attr);
msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname);
return TRUE;
}
OpenPOWER on IntegriCloud