Diff between 643b074d7dc7f722588192eea852ce2e0d0584ae and 293d670fb0ec51b69cdd0b9bf625b1e4d3a7975f

Changed Files

File Additions Deletions Status
monitor/packet.c +4 -12 modified

Full Patch

diff --git a/monitor/packet.c b/monitor/packet.c
index 1a41498..6920120 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -405,12 +405,7 @@ static void print_packet(struct timeval *tv, struct ucred *cred, char ident,
 	}
 
 	if (use_color()) {
-		n = sprintf(ts_str + ts_pos, "%s", COLOR_OFF);
-		if (n > 0)
-			ts_pos += n;
-	}
-
-	if (use_color()) {
+		sprintf(ts_str + ts_pos, "%s", COLOR_OFF);
 		n = sprintf(line + pos, "%s", color);
 		if (n > 0)
 			pos += n;
@@ -451,10 +446,8 @@ static void print_packet(struct timeval *tv, struct ucred *cred, char ident,
 
 	if (extra) {
 		n = sprintf(line + pos, " %s", extra);
-		if (n > 0) {
-			pos += n;
+		if (n > 0)
 			len += n;
-		}
 	}
 
 	if (ts_len > 0) {
@@ -7474,7 +7467,6 @@ static void print_le_phys_preference(uint8_t all_phys, uint8_t tx_phys,
 							" (0x%2.2x)", mask);
 
 	print_field("TX PHYs preference: 0x%2.2x", tx_phys);
-	mask = tx_phys;
 
 	mask = print_bitfield(2, tx_phys, le_phys);
 	if (mask)
@@ -7482,7 +7474,6 @@ static void print_le_phys_preference(uint8_t all_phys, uint8_t tx_phys,
 							" (0x%2.2x)", mask);
 
 	print_field("RX PHYs preference: 0x%2.2x", rx_phys);
-	mask = rx_phys;
 
 	mask = print_bitfield(2, rx_phys, le_phys);
 	if (mask)
@@ -11239,10 +11230,11 @@ static void le_pa_report_evt(uint16_t index, const void *data, uint8_t size)
 		break;
 	default:
 		str = "Reserved";
-		color_on = COLOR_RED;
 		break;
 	}
 
+	print_field("CTE Type: %s (0x%2x)", str, evt->cte_type);
+
 	switch (evt->data_status) {
 	case 0x00:
 		str = "Complete";