From c66fbf481fb3e4b39a36744230239f5eb953dd4e Mon Sep 17 00:00:00 2001 From: Darius Davis Date: Sat, 1 Dec 2018 14:33:50 +1000 Subject: [PATCH] Re-balance DINDENT/DENDENT macros in conversation.c. The indent macros used for DEBUG_CONVERSATION have become unbalanced, making the conversation debug output migrate rightwards for no good reason. This simple change corrects it by ensuring that DINDENT and DENDENT are neatly paired up throughout conversation.c . Testing Done: Built on macOS 10.12.6 with DEBUG_CONVERSATION enabled. Tested tshark with a few captures, and observed that the debug output, while still being indented, generally stayed along the left margin of the screen instead of migrating steadily over to the right. Change-Id: Ic91e4562296d34f74c4d832edbf75172562672b8 Reviewed-on: https://code.wireshark.org/review/30856 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/conversation.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epan/conversation.c b/epan/conversation.c index fc94e3d65b..f6bf67ea30 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -1477,6 +1477,8 @@ find_conversation_pinfo(packet_info *pinfo, const guint options) } } + DENDENT(); + return conv; } @@ -1503,8 +1505,6 @@ find_or_create_conversation(packet_info *pinfo) DENDENT(); } - DENDENT(); - return conv; } @@ -1523,8 +1523,6 @@ find_or_create_conversation_by_id(packet_info *pinfo, const endpoint_type etype, DENDENT(); } - DENDENT(); - return conv; }