From fc1297dc93693ff07aa72e08754f41c461dd37f6 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Tue, 20 Jan 2004 19:01:22 +0000 Subject: [PATCH] fix va_arg() warning, and label placement warning XXX perhaps MS_TYP_CHA should go completely, it's equal to MS_TYP_INT XXX effectively --- sys/dev/ppbus/ppbus_msq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/ppbus/ppbus_msq.c b/sys/dev/ppbus/ppbus_msq.c index eb01446d34d6..b3ade430faf4 100644 --- a/sys/dev/ppbus/ppbus_msq.c +++ b/sys/dev/ppbus/ppbus_msq.c @@ -236,7 +236,11 @@ ppbus_MS_init_msq(struct ppbus_microseq * msq, int nbparam, ...) break; case MS_TYP_CHA: + /* XXX was: msq[ins].arg[arg].i = (int)va_arg(p_list, char); + which gives warning with gcc 3.3 + */ + msq[ins].arg[arg].i = (int)va_arg(p_list, int); break; case MS_TYP_PTR: @@ -288,6 +292,7 @@ ppbus_MS_microseq(struct device * dev, struct device * busdev, #define INCR_PC (mi ++) mi = msq; +again: for (;;) { switch (mi->opcode) { case MS_OP_PUT: @@ -307,7 +312,7 @@ ppbus_MS_microseq(struct device * dev, struct device * busdev, } INCR_PC; - goto next; + goto again; } else { panic("%s: IEEE1284 read not supported", @@ -355,7 +360,6 @@ ppbus_MS_microseq(struct device * dev, struct device * busdev, } break; } - next: } error: return (error);