Get rid of proto_tree_add_debug_text() calls

This function should not be used for anything else than debug, as stated
in its name.

Bug: 15989
Change-Id: Ie2a99f3487169fcf2d00c06e7fc5d61086f32969
Reviewed-on: https://code.wireshark.org/review/34954
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

1 files changed, 14 insertions, 28 deletions

diff --git a/epan/dissectors/packet-cemi.c b/epan/dissectors/packet-cemi.c
index 5b923f71ff..d8ff9e9bc7 100644
--- a/epan/dissectors/packet-cemi.c
+++ b/epan/dissectors/packet-cemi.c
@@ -1213,8 +1213,7 @@ static guint8 dissect_ox( tvbuff_t *tvb, packet_info *pinfo, proto_item *node, p
     return ox;
   }
 
-  node = proto_tree_add_debug_text( list, "? Object Index" );
-  expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+  node = proto_tree_add_expert_format( list, pinfo, KIP_ERROR, tvb, offset, 0, "? Object Index: expected 1 byte" );
 
   if( p_error )
   {
@@ -1288,8 +1287,7 @@ static guint8 dissect_pid( tvbuff_t *tvb, packet_info *pinfo, proto_item *node,
     return pid;
   }
 
-  node = proto_tree_add_debug_text( list, "? Property ID" );
-  expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+  node = proto_tree_add_expert_format( list, pinfo, KIP_ERROR, tvb, offset, 0, "? Property ID: expected 1 byte" );
 
   if( p_error )
   {
@@ -1322,8 +1320,7 @@ static guint8 dissect_px( tvbuff_t *tvb, packet_info *pinfo, proto_item *node, p
     return px;
   }
 
-  node = proto_tree_add_debug_text( list, "? Property Index" );
-  expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+  node = proto_tree_add_expert_format( list, pinfo, KIP_ERROR, tvb, offset, 0, "? Property Index: expected 1 byte" );
 
   if( p_error )
   {
@@ -1636,8 +1633,7 @@ static void dissect_cemi_mgmt_packet( tvbuff_t* tvb, packet_info* pinfo, proto_i
     /* 1 byte Object Instance */
     if( size < 4 )
     {
-      proto_item* node = proto_tree_add_debug_text( cemi_list, "? Object Instance" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+      proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Object Instance: expected 1 byte" );
       error = 1;
     }
     else
@@ -1850,8 +1846,7 @@ static void dissect_authenticate_service( tvbuff_t* tvb, packet_info* pinfo, pro
   /* 1 byte Level */
   if( offset >= size )
   {
-    proto_item* node = proto_tree_add_debug_text( cemi_list, "? Level" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Level: expected 1 byte" );
     error = 1;
   }
   else
@@ -1957,8 +1952,7 @@ static void dissect_ia_serial_number_service( tvbuff_t* tvb, packet_info* pinfo,
   {
     if( offset >= size )
     {
-      node = proto_tree_add_debug_text( cemi_list, "? Data" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Missing" );
+      node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Data: missing" );
       error = 1;
     }
   }
@@ -2719,8 +2713,7 @@ static void dissect_simple_app_service( tvbuff_t* tvb, packet_info* pinfo, proto
     /* 1 byte Count */
     if( offset >= size )
     {
-      node = proto_tree_add_debug_text( cemi_list, "? Count" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+      node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Count: expected 1 byte" );
       error = 1;
       --offset;
     }
@@ -2844,8 +2837,7 @@ static void dissect_cemi_transport_layer( tvbuff_t* tvb, packet_info* pinfo, pro
   /* 6 bits TPCI */
   if( offset >= size )
   {
-    node = proto_tree_add_debug_text( cemi_list, "? TPCI" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? TPCI: expected 1 byte" );
     error = 1;
   }
   else
@@ -2957,10 +2949,8 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr
 
   if( size < 2 )
   {
-    ai_node = proto_tree_add_debug_text( cemi_list, "? Additional Info" );
-    ai_list = proto_item_add_subtree( ai_node, ett_cemi_ai );
-    node = proto_tree_add_debug_text( ai_list, "? Length" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    ai_list = proto_tree_add_subtree( cemi_list, tvb, offset, 0, ett_cemi_ai, &ai_node, "? Additional Info" );
+    node = proto_tree_add_expert_format( ai_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Length: expected 1 byte" );
     offset = size;
     error = 1;
   }
@@ -3030,8 +3020,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr
       if( error == 3 )
       {
         proto_item_prepend_text( aie_node, "? " );
-        node = proto_tree_add_debug_text( aie_list, "? Length" );
-        expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+        node = proto_tree_add_expert_format( aie_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Length: expected 1 byte" );
         break;
       }
 
@@ -3128,8 +3117,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr
       /* 1 byte Control Field 1 */
       if( offset >= size )
       {
-        node = proto_tree_add_debug_text( cemi_list, "? Ctrl1" );
-        expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+        node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Ctrl1: expected 1 byte" );
         error = 1;
       }
       else
@@ -3185,8 +3173,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr
       /* 1 byte Control Field 2 */
       if( offset >= size )
       {
-        node = proto_tree_add_debug_text( cemi_list, "? Ctrl2" );
-        expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+        node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Ctrl2: expected 1 byte" );
         error = 1;
       }
       else
@@ -3281,8 +3268,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr
       /* 1 byte NPDU Length */
       if( offset >= size )
       {
-        node = proto_tree_add_debug_text( cemi_list, "? Length" );
-        expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+        node = proto_tree_add_expert_format( cemi_list, pinfo, KIP_ERROR, tvb, offset, 0, "? Length: expected 1 byte" );
         error = 1;
       }
       else