Fixed printf format errors. Only one left in LINT on i386's.

2 files changed, 17 insertions, 21 deletions

diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index 2c9bf36..f16b6a0 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: errors.c,v 1.7 1997/02/22 09:29:01 peter Exp $
+ *    $Id: errors.c,v 1.8 1997/06/14 15:11:03 bde Exp $
  *
  */
 
@@ -98,7 +98,7 @@ Un_impl(void)
 	byte1 = fubyte((unsigned char *) FPU_ORIG_EIP);
 	FPU_modrm = fubyte(1 + (unsigned char *) FPU_ORIG_EIP);
 
-	printf("Unimplemented FPU Opcode at eip=%p : %02x ",
+	printf("Unimplemented FPU Opcode at eip=%#08x : %02x ",
 	    FPU_ORIG_EIP, byte1);
 
 	if (FPU_modrm >= 0300)
@@ -158,7 +158,7 @@ emu_printall()
 	status_word = status_word & ~SW_Top;
 	status_word |= (top & 7) << SW_Top_Shift;
 
-	printf("At %p: %02x ", FPU_ORIG_EIP, byte1);
+	printf("At %#08x: %02x ", FPU_ORIG_EIP, byte1);
 	if (FPU_modrm >= 0300)
 		printf("%02x (%02x+%d)\n", FPU_modrm, FPU_modrm & 0xf8, FPU_modrm & 7);
 	else
@@ -167,7 +167,7 @@ emu_printall()
 
 	printf(" SW: b=%d st=%d es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",
 	    status_word & 0x8000 ? 1 : 0,	/* busy */
-	    (status_word & 0x3800) >> 11,	/* stack top pointer */
+	    (int)((status_word & 0x3800) >> 11),	/* stack top pointer */
 	    status_word & 0x80 ? 1 : 0,	/* Error summary status */
 	    status_word & 0x40 ? 1 : 0,	/* Stack flag */
 	    status_word & SW_C3 ? 1 : 0, status_word & SW_C2 ? 1 : 0,	/* cc */
@@ -178,8 +178,10 @@ emu_printall()
 
 	printf(" CW: ic=%d rc=%d%d pc=%d%d iem=%d     ef=%d%d%d%d%d%d\n",
 	    control_word & 0x1000 ? 1 : 0,
-	    (control_word & 0x800) >> 11, (control_word & 0x400) >> 10,
-	    (control_word & 0x200) >> 9, (control_word & 0x100) >> 8,
+	    (int)((control_word & 0x800) >> 11),
+	    (int)((control_word & 0x400) >> 10),
+	    (int)((control_word & 0x200) >> 9),
+	    (int)((control_word & 0x100) >> 8),
 	    control_word & 0x80 ? 1 : 0,
 	    control_word & SW_Precision ? 1 : 0, control_word & SW_Underflow ? 1 : 0,
 	    control_word & SW_Overflow ? 1 : 0, control_word & SW_Zero_Div ? 1 : 0,
@@ -199,12 +201,9 @@ emu_printall()
 		case TW_NaN:
 		case TW_Denormal:
 		case TW_Infinity:
-			printf("st(%d)  %c .%04x %04x %04x %04x e%+-6d ", i,
-			    r->sign ? '-' : '+',
-			    (long) (r->sigh >> 16),
-			    (long) (r->sigh & 0xFFFF),
-			    (long) (r->sigl >> 16),
-			    (long) (r->sigl & 0xFFFF),
+			printf("st(%d)  %c .%04lx %04lx %04lx %04lx e%+-6ld ",
+			    i, r->sign ? '-' : '+', r->sigh >> 16,
+			    r->sigh & 0xFFFF, r->sigl >> 16, r->sigl & 0xFFFF,
 			    r->exp - EXP_BIAS + 1);
 			break;
 		default:
@@ -214,13 +213,10 @@ emu_printall()
 		printf("%s\n", tag_desc[(int) (unsigned) r->tag]);
 	}
 
-	printf("[data] %c .%04x %04x %04x %04x e%+-6d ",
-	    FPU_loaded_data.sign ? '-' : '+',
-	    (long) (FPU_loaded_data.sigh >> 16),
-	    (long) (FPU_loaded_data.sigh & 0xFFFF),
-	    (long) (FPU_loaded_data.sigl >> 16),
-	    (long) (FPU_loaded_data.sigl & 0xFFFF),
-	    FPU_loaded_data.exp - EXP_BIAS + 1);
+	printf("[data] %c .%04lx %04lx %04lx %04lx e%+-6ld ",
+	    FPU_loaded_data.sign ? '-' : '+', FPU_loaded_data.sigh >> 16,
+	    FPU_loaded_data.sigh & 0xFFFF, FPU_loaded_data.sigl >> 16,
+	    FPU_loaded_data.sigl & 0xFFFF, FPU_loaded_data.exp - EXP_BIAS + 1);
 	printf("%s\n", tag_desc[(int) (unsigned) FPU_loaded_data.tag]);
 	REENTRANT_CHECK(ON);
 
diff --git a/sys/gnu/i386/isa/sound/awe_wave.c b/sys/gnu/i386/isa/sound/awe_wave.c
index c4f3cbf..3dc591e 100644
--- a/sys/gnu/i386/isa/sound/awe_wave.c
+++ b/sys/gnu/i386/isa/sound/awe_wave.c
@@ -3306,7 +3306,7 @@ awe_load_guspatch(const char *addr, int offs, int size, int pmgr_flag)
 	COPY_FROM_USER(((char*)&patch) + offs, addr, offs, sizeof_patch - offs);
 	size -= sizeof_patch;
 	if (size < patch.len) {
-		printk("AWE32 Warning: Patch record too short (%d<%d)\n",
+		printk("AWE32 Warning: Patch record too short (%d<%ld)\n",
 		       size, patch.len);
 		return RET_ERROR(EINVAL);
 	}
@@ -3369,7 +3369,7 @@ awe_load_guspatch(const char *addr, int offs, int size, int pmgr_flag)
 	rec->tune = -(note % 100);
 	rec->low = freq_to_note(patch.low_note) / 100;
 	rec->high = freq_to_note(patch.high_note) / 100;
-	DEBUG(1,printk("AWE32: [gus base offset=%d, note=%d, range=%d-%d(%d-%d)]\n",
+	DEBUG(1,printk("AWE32: [gus base offset=%d, note=%d, range=%d-%d(%lu-%lu)]\n",
 		       rec->rate_offset, note,
 		       rec->low, rec->high,
 	      patch.low_note, patch.high_note));