Fix a nasty bug that was exposed by disabling the trace support by

default. There were 2 cases where the trace code was in the else-
part of an if-statement without any compound construct to protect
against nullification. The result was that 2 unconditional statements
turned into conditional statements and wrecked havoc.

This fix has been returned to the vendor and in anticipation of a
future import committed onto the vendor branch.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/contrib/ia64/libuwx/src/uwx_uinfo.c b/sys/contrib/ia64/libuwx/src/uwx_uinfo.c
index 1244026..865f259 100644
--- a/sys/contrib/ia64/libuwx/src/uwx_uinfo.c
+++ b/sys/contrib/ia64/libuwx/src/uwx_uinfo.c
@@ -232,9 +232,9 @@ int uwx_decode_rhdr(
 	if ((b0 & 0x20) == 0) {
 	    TRACE_I_DECODE_RHDR_1("(R1) prologue", b0)
 	    rhdr->is_prologue = 1;
-	}
-	else
+	} else {
 	    TRACE_I_DECODE_RHDR_1("(R1) body", b0)
+	}
 	rhdr->rlen = b0 & 0x1f;
     }
 
@@ -263,9 +263,9 @@ int uwx_decode_rhdr(
 	if ((b0 & 0x03) == 0) {
 	    TRACE_I_DECODE_RHDR_1L("(R3) prologue", b0, val)
 	    rhdr->is_prologue = 1;
-	}
-	else
+	} else {
 	    TRACE_I_DECODE_RHDR_1L("(R3) body", b0, val)
+	}
 	rhdr->rlen = (unsigned int) val;
     }