diff options
| author | dfr <dfr@FreeBSD.org> | 1998-09-26 10:51:38 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1998-09-26 10:51:38 +0000 |
| commit | ad6ddb77671a5780eefdb973075656e601890d74 (patch) | |
| tree | 7ee815e87abf339583a4b840f14159bc49a21714 /sys/boot/alpha/libalpha | |
| parent | 236ad5eb3ca90664e90a383de91faa975d35b8fc (diff) | |
| download | FreeBSD-src-ad6ddb77671a5780eefdb973075656e601890d74.zip FreeBSD-src-ad6ddb77671a5780eefdb973075656e601890d74.tar.gz | |
* Add old UFS compatibility code to alpha/boot1.
* Fix a raft of warnings, printf and otherwise.
* Allocate the correct amount in mod_searchmodule to prevent an overflow.
* Fix the makefiles so they work outside my home directory (oops).
Diffstat (limited to 'sys/boot/alpha/libalpha')
| -rw-r--r-- | sys/boot/alpha/libalpha/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/alpha/libalpha/devicename.c | 11 | ||||
| -rw-r--r-- | sys/boot/alpha/libalpha/libalpha.h | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile index 92ccbdf..1478b74 100644 --- a/sys/boot/alpha/libalpha/Makefile +++ b/sys/boot/alpha/libalpha/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1998/08/22 10:31:01 dfr Exp $ +# $Id: Makefile,v 1.3 1998/08/31 21:10:40 msmith Exp $ LIB= alpha NOPIC= true @@ -6,8 +6,9 @@ NOPROFILE= true INTERNALLIB= true # XXX hack to pick up stand.h -CFLAGS= -I/home/dfr/FreeBSD/alpha/src/lib/libstand -CFLAGS+= -DDEBUG +LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand +CFLAGS= -I${LIBSTANDDIR} +CFLAGS+= -DDEBUG # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c index 5d1f604..dcd07ed 100644 --- a/sys/boot/alpha/libalpha/devicename.c +++ b/sys/boot/alpha/libalpha/devicename.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devicename.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ + * $Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $ */ #include <stand.h> @@ -32,7 +32,7 @@ #include "bootstrap.h" #include "libalpha.h" -static int alpha_parsedev(struct alpha_devdesc **dev, char *devspec, char **path); +static int alpha_parsedev(struct alpha_devdesc **dev, const char *devspec, const char **path); /* * Point (dev) at an allocated device specifier for the device matching the @@ -40,7 +40,7 @@ static int alpha_parsedev(struct alpha_devdesc **dev, char *devspec, char **path * use that. If not, use the default device. */ int -alpha_getdev(void **vdev, char *devspec, char **path) +alpha_getdev(void **vdev, const char *devspec, const char **path) { struct alpha_devdesc **dev = (struct alpha_devdesc **)vdev; int rv; @@ -80,12 +80,13 @@ alpha_getdev(void **vdev, char *devspec, char **path) * */ static int -alpha_parsedev(struct alpha_devdesc **dev, char *devspec, char **path) +alpha_parsedev(struct alpha_devdesc **dev, const char *devspec, const char **path) { struct alpha_devdesc *idev; struct devsw *dv; int i, unit, slice, partition, err; - char *cp, *np; + char *cp; + const char *np; /* minimum length check */ if (strlen(devspec) < 2) diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h index c5a2e17..79b231a 100644 --- a/sys/boot/alpha/libalpha/libalpha.h +++ b/sys/boot/alpha/libalpha/libalpha.h @@ -1,4 +1,4 @@ -/* $Id: libalpha.h,v 1.2 1998/08/31 21:10:40 msmith Exp $ */ +/* $Id: libalpha.h,v 1.3 1998/09/20 21:46:19 dfr Exp $ */ /* * Copyright (c) 1996 @@ -58,7 +58,7 @@ struct alpha_devdesc } d_kind; }; -extern int alpha_getdev(void **vdev, char *devspec, char **path); +extern int alpha_getdev(void **vdev, const char *devspec, const char **path); extern char *alpha_fmtdev(void *vdev); extern int alpha_setcurrdev(struct env_var *ev, int flags, void *value); |
