aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Traina <pst@FreeBSD.org>1995-08-23 05:26:21 +0000
committerPaul Traina <pst@FreeBSD.org>1995-08-23 05:26:21 +0000
commitabdd03a3641ebecb1fbcb96039b576e5a3510b01 (patch)
treea75f26e23c82847019144ec1126d36af136d5626
parent881f591647bbccfc9fe18d0a6e5a1b45b136d6c9 (diff)
Notes
-rw-r--r--sys/i386/boot/kzipboot/malloc.c4
-rw-r--r--usr.sbin/pkg_manage/pkg_manage.h1
-rw-r--r--usr.sbin/pkg_manage/pkg_ui.c9
3 files changed, 3 insertions, 11 deletions
diff --git a/sys/i386/boot/kzipboot/malloc.c b/sys/i386/boot/kzipboot/malloc.c
index 7890097c908d..7437eaebd991 100644
--- a/sys/i386/boot/kzipboot/malloc.c
+++ b/sys/i386/boot/kzipboot/malloc.c
@@ -42,9 +42,9 @@ malloc(nbytes, junk1, junk2) /* junk? not used */
{
unsigned char *p = storage;
storage += nbytes;
- if (storage >= 0xa0000) {
+ if (storage >= (unsigned char *) 0xa0000) {
putstr("warning: malloc wrapped\n\r");
- p = (unsigned char *)0x50000;
+ p = (unsigned char *) 0x50000;
storage = p + nbytes;
}
return p;
diff --git a/usr.sbin/pkg_manage/pkg_manage.h b/usr.sbin/pkg_manage/pkg_manage.h
index d2b66a9a2810..f7bcd3db774d 100644
--- a/usr.sbin/pkg_manage/pkg_manage.h
+++ b/usr.sbin/pkg_manage/pkg_manage.h
@@ -77,3 +77,4 @@ int get_desc(char *fname, char **name, char **comment,
char **desc, long *size, char *tmp_file);
int exec_catch_errors(char *prog, char *arg, char *fout);
int already_installed(char *name);
+void install_pkgs_indir(void);
diff --git a/usr.sbin/pkg_manage/pkg_ui.c b/usr.sbin/pkg_manage/pkg_ui.c
index ae4fa44ea31f..44814530bb1c 100644
--- a/usr.sbin/pkg_manage/pkg_ui.c
+++ b/usr.sbin/pkg_manage/pkg_ui.c
@@ -28,15 +28,6 @@
extern PKG_info p_inf;
-
-/*
- * Local prototypes
- */
-
-void install_pkgs_indir(void);
-
-
-
/*
* Functions
*/