Don't show "func=" if the P/F bit isn't set.

Don't put an extra space between "func=" and "P" or "F" if it is set.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10286 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 7 insertions, 7 deletions

diff --git a/xdlc.c b/xdlc.c
index 885ab13fb8..3873f67fa6 100644
--- a/xdlc.c
+++ b/xdlc.c
@@ -2,7 +2,7 @@
  * Routines for use by various SDLC-derived protocols, such as HDLC
  * and its derivatives LAPB, IEEE 802.2 LLC, etc..
  *
- * $Id: xdlc.c,v 1.24 2004/01/20 20:27:11 guy Exp $
+ * $Id: xdlc.c,v 1.25 2004/03/03 02:06:19 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -223,16 +223,16 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	}
 	if (is_extended) {
 	    poll_final = (control & XDLC_P_F_EXT);
-	    sprintf(info, "S%s, func=%s, N(R)=%u", frame_type,
+	    sprintf(info, "S%s%s, N(R)=%u", frame_type,
 		 	(poll_final ?
-		 	    (is_response ? " F" : " P") :
+		 	    (is_response ? ", func=F" : ", func=P") :
 		 	    ""),
 			(control & XDLC_N_R_EXT_MASK) >> XDLC_N_R_EXT_SHIFT);
 	} else {
 	    poll_final = (control & XDLC_P_F);
-	    sprintf(info, "S%s, func=%s, N(R)=%u",
+	    sprintf(info, "S%s%s, N(R)=%u",
 		 	(poll_final ?
-		 	    (is_response ? " F" : " P") :
+		 	    (is_response ? ", func=F" : ", func=P") :
 		 	    ""),
 		 	frame_type,
 			(control & XDLC_N_R_MASK) >> XDLC_N_R_SHIFT);
@@ -293,9 +293,9 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	if (modifier == NULL)
 		modifier = "Unknown";
 	poll_final = (control & XDLC_P_F);
-	sprintf(info, "U%s, func=%s",
+	sprintf(info, "U%s%s",
 		(poll_final ?
-		    (is_response ? " F" : " P") :
+		    (is_response ? ", func=F" : ", func=P") :
 		    ""),
 		modifier);
 	if (check_col(pinfo->cinfo, COL_INFO)) {