3 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/hppa/stand/libsa/dk.c b/sys/arch/hppa/stand/libsa/dk.c
index ad96a5db960..77bfb906dae 100644
--- a/sys/arch/hppa/stand/libsa/dk.c
+++ b/sys/arch/hppa/stand/libsa/dk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dk.c,v 1.12 2003/08/11 06:51:45 mickey Exp $	*/
+/*	$OpenBSD: dk.c,v 1.13 2004/11/22 18:41:41 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -36,7 +36,7 @@ const char *
 dk_disklabel(struct hppa_dev *dp, struct disklabel *label)
 {
 	char buf[DEV_BSIZE];
-	int ret;
+	size_t ret;
 
 	if (iodcstrategy(dp, F_READ, LABELSECTOR, DEV_BSIZE, buf, &ret))
 		if (ret != DEV_BSIZE)
diff --git a/sys/arch/hppa/stand/libsa/lif.c b/sys/arch/hppa/stand/libsa/lif.c
index 19c5994b94d..99e43f255a7 100644
--- a/sys/arch/hppa/stand/libsa/lif.c
+++ b/sys/arch/hppa/stand/libsa/lif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lif.c,v 1.9 2004/04/07 18:24:20 mickey Exp $	*/
+/*	$OpenBSD: lif.c,v 1.10 2004/11/22 18:41:41 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -55,7 +55,8 @@ lif_open (path, f)
 	struct lifdir *dp;
 	char *p, *q;
 	struct lif_load load;
-	int err, buf_size, l;
+	size_t buf_size;
+	int err, l;
 
 #ifdef LIFDEBUG
 	if (debug)
diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c
index 605144d3d53..aa656dcfa99 100644
--- a/sys/arch/hppa/stand/mkboot/mkboot.c
+++ b/sys/arch/hppa/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkboot.c,v 1.14 2003/08/11 06:51:45 mickey Exp $	*/
+/*	$OpenBSD: mkboot.c,v 1.15 2004/11/22 18:41:42 mickey Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -39,7 +39,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.14 2003/08/11 06:51:45 mickey Exp $";
+static char rcsid[] = "$OpenBSD: mkboot.c,v 1.15 2004/11/22 18:41:42 mickey Exp $";
 #endif /* not lint */
 #endif
 
@@ -224,8 +224,8 @@ putfile(from_file, to)
 		if (n != sizeof (elf_header))
 			err(1, "%s: reading ELF header", from_file);
 		header_count = ntohs(elf_header.e_phnum);
-		memory_needed = header_count * sizeof (Elf32_Phdr);
-		elf_segments = (Elf32_Phdr *)malloc(memory_needed);
+		memory_needed = header_count * sizeof (*elf_segments);
+		elf_segments = malloc(memory_needed);
 		if (elf_segments == NULL)
 			err(1, "malloc");
 		(void) lseek(from, ntohl(elf_header.e_phoff), SEEK_SET);