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>

3 files changed, 37 insertions, 61 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
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index d888883edb..85328a276a 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -677,6 +677,7 @@ static expert_field ei_dcerpc_invalid_pdu_authentication_attempt = EI_INIT;
 /* Generated from convert_proto_tree_add_text.pl */
 static expert_field ei_dcerpc_long_frame = EI_INIT;
 static expert_field ei_dcerpc_cn_rts_command = EI_INIT;
+static expert_field ei_dcerpc_not_implemented = EI_INIT;
 
 static const guint8 TRAILER_SIGNATURE[] = {0x8a, 0xe3, 0x13, 0x71, 0x02, 0xf4, 0x36, 0x71};
 static tvbuff_t *tvb_trailer_signature = NULL;
@@ -2196,7 +2197,7 @@ dissect_dcerpc_uint64(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
 
 
 int
-dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                      proto_tree *tree, guint8 *drep,
                      int hfindex, gfloat *pdata)
 {
@@ -2219,9 +2220,9 @@ dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
         /* ToBeDone: non IEEE floating formats */
         /* Set data to a negative infinity value */
         data = -G_MAXFLOAT;
-        if (tree && hfindex != -1) {
-            proto_tree_add_debug_text(tree, "DCE RPC: dissection of non IEEE floating formats currently not implemented (drep=%u)!", drep[1]);
-        }
+        proto_tree_add_expert_format(tree, pinfo, &ei_dcerpc_not_implemented, tvb, offset, 4,
+                                     "DCE RPC: dissection of non IEEE floating formats currently not implemented (drep=%u)!",
+                                     drep[1]);
     }
     if (pdata)
         *pdata = data;
@@ -2254,9 +2255,9 @@ dissect_dcerpc_double(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
         /* ToBeDone: non IEEE double formats */
         /* Set data to a negative infinity value */
         data = -G_MAXDOUBLE;
-        if (tree && hfindex != -1) {
-            proto_tree_add_debug_text(tree, "DCE RPC: dissection of non IEEE double formats currently not implemented (drep=%u)!", drep[1]);
-        }
+        proto_tree_add_expert_format(tree, pinfo, &ei_dcerpc_not_implemented, tvb, offset, 8,
+                                     "DCE RPC: dissection of non IEEE double formats currently not implemented (drep=%u)!",
+                                     drep[1]);
     }
     if (pdata)
         *pdata = data;
@@ -7035,6 +7036,7 @@ proto_register_dcerpc(void)
         /* Generated from convert_proto_tree_add_text.pl */
         { &ei_dcerpc_long_frame, { "dcerpc.long_frame", PI_PROTOCOL, PI_WARN, "Long frame", EXPFILL }},
         { &ei_dcerpc_cn_rts_command, { "dcerpc.cn_rts_command.unknown", PI_PROTOCOL, PI_WARN, "unknown RTS command number", EXPFILL }},
+        { &ei_dcerpc_not_implemented, { "dcerpc.not_implemented", PI_UNDECODED, PI_WARN, "dissection not implemented", EXPFILL }},
     };
 
     /* Decode As handling */
diff --git a/epan/dissectors/packet-knxip.c b/epan/dissectors/packet-knxip.c
index 9c0c2c7a78..bdafe6fac9 100644
--- a/epan/dissectors/packet-knxip.c
+++ b/epan/dissectors/packet-knxip.c
@@ -551,10 +551,9 @@ static proto_item* knxip_tree_add_reserved( proto_tree* tree, tvbuff_t* tvb, gin
   return new_item;
 }
 
-static proto_item* knxip_tree_add_missing_reserved( proto_tree* tree, packet_info* pinfo )
+static proto_item* knxip_tree_add_missing_reserved( proto_tree* tree, tvbuff_t* tvb, gint offset, packet_info* pinfo )
 {
-  proto_item* new_item = proto_tree_add_debug_text( tree, "? Reserved" );
-  expert_add_info_format( pinfo, new_item, KIP_ERROR, "Expected: 1 byte" );
+  proto_item* new_item = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Reserved: expected 1 byte" );
   return new_item;
 }
 
@@ -1256,8 +1255,7 @@ static void dissect_tunneling_feature( tvbuff_t* tvb, packet_info* pinfo, proto_
   /* 1 byte Feature Identifier */
   if( remaining_len <= 0 )
   {
-    node = proto_tree_add_debug_text( tree, "? Feature Identifier" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Feature Identifier: expected 1 byte" );
     ok = 0;
   }
   else
@@ -1278,8 +1276,7 @@ static void dissect_tunneling_feature( tvbuff_t* tvb, packet_info* pinfo, proto_
   name = isResponse ? "Status" : "Reserved";
   if( remaining_len <= 0 )
   {
-    node = proto_tree_add_debug_text( tree, "? %s", name );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? %s: expected 1 byte", name );
     ok = 0;
   }
   else
@@ -1302,8 +1299,7 @@ static void dissect_tunneling_feature( tvbuff_t* tvb, packet_info* pinfo, proto_
   {
     if( service != KIP_TUNNELING_FEATURE_GET && status == 0 )
     {
-      node = proto_tree_add_debug_text( tree, "? Feature Value" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Missing" );
+      node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Feature Value: missing" );
       ok = 0;
     }
   }
@@ -2522,8 +2518,7 @@ static guint8 dissect_resetter( tvbuff_t* tvb, packet_info* pinfo, proto_item* i
 
   if( struct_len <= 0 )
   {
-    node = proto_tree_add_debug_text( tree, "? Command, Reserved" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 2 bytes" );
+    node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Command, Reserved: expected 2 bytes" );
   }
   else
   {
@@ -2542,8 +2537,7 @@ static guint8 dissect_resetter( tvbuff_t* tvb, packet_info* pinfo, proto_item* i
 
     if( struct_len != 2 )
     {
-      node = proto_tree_add_debug_text( tree, "? Reserved" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+      node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Reserved: expected 1 byte" );
       ok = 0;
     }
     else
@@ -2965,8 +2959,7 @@ static guint8 dissect_session_request( tvbuff_t* tvb, packet_info* pinfo, proto_
     /* DH Client Public Value */
     if( size <= 0 )
     {
-      node = proto_tree_add_debug_text( tree, "? DH Client Public Value" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Missing" );
+      node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? DH Client Public Value: missing" );
       ok = 0;
     }
     else
@@ -3070,8 +3063,7 @@ static guint8 dissect_session_auth( tvbuff_t* tvb, packet_info* pinfo, proto_ite
   /* 1 byte Reserved */
   if( size <= 0 )
   {
-    node = proto_tree_add_debug_text( tree, "? Reserved" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Reserved: expected 1 byte" );
     ok = 0;
   }
   else
@@ -3083,8 +3075,7 @@ static guint8 dissect_session_auth( tvbuff_t* tvb, packet_info* pinfo, proto_ite
     /* 1 byte User ID */
     if( size <= 0 )
     {
-      node = proto_tree_add_debug_text( tree, "? User" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+      node = proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? User: expected 1 byte" );
       ok = 0;
     }
     else
@@ -3124,13 +3115,11 @@ static guint8 dissect_session_status( tvbuff_t* tvb, packet_info* pinfo, proto_i
   gint offset = *p_offset;
   column_info* cinfo = pinfo->cinfo;
   gint size = tvb_captured_length_remaining( tvb, offset );
-  proto_item* node;
 
   /* 1 byte Status */
   if( size <= 0 )
   {
-    node = proto_tree_add_debug_text( tree, "? Status" );
-    expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+    proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Status: expected 1 byte" );
     ok = 0;
   }
   else
@@ -3145,8 +3134,7 @@ static guint8 dissect_session_status( tvbuff_t* tvb, packet_info* pinfo, proto_i
     /* 1 byte Reserved */
     if( size <= 0 )
     {
-      node = proto_tree_add_debug_text( tree, "? Reserved" );
-      expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: 1 byte" );
+      proto_tree_add_expert_format( tree, pinfo, KIP_ERROR, tvb, offset, 0, "? Reserved: expected 1 byte" );
       ok = 0;
     }
     else
@@ -3376,7 +3364,7 @@ static void dissect_knxip_data( guint8 header_length, guint8 protocol_version _U
             /* Reserved Byte */
             if( remaining_len < 2 )
             {
-              knxip_tree_add_missing_reserved( kip_tree, pinfo );
+              knxip_tree_add_missing_reserved( kip_tree, tvb, offset, pinfo );
               ok = 0;
             }
             else
@@ -3457,7 +3445,7 @@ static void dissect_knxip_data( guint8 header_length, guint8 protocol_version _U
             /* Reserved Byte */
             if( remaining_len < 2 )
             {
-              knxip_tree_add_missing_reserved( kip_tree, pinfo );
+              knxip_tree_add_missing_reserved( kip_tree, tvb, offset, pinfo );
               ok = 0;
             }
             else