Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.

The script didn't catch as many as I would have liked, but it's a start.

The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.

svn path=/trunk/; revision=52045

1 files changed, 4 insertions, 4 deletions

diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c
index 37b36230d7..9d05123f74 100644
--- a/epan/dissectors/packet-ixveriwave.c
+++ b/epan/dissectors/packet-ixveriwave.c
@@ -765,15 +765,15 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
             proto_tree_add_item(tap_tree, hf_radiotap_nss,
                                 tvb, offset - 1, 1, ENC_BIG_ENDIAN);
 
-            proto_tree_add_uint_format(tap_tree, hf_radiotap_datarate,
+            proto_tree_add_uint_format_value(tap_tree, hf_radiotap_datarate,
                                        tvb, offset - 5, 2, tvb_get_letohs(tvb, offset-5),
-                                       "Data rate: %.1f (MCS %d)", phyRate, mcs_index);
+                                       "%.1f (MCS %d)", phyRate, mcs_index);
         }
     } else {
         if (tree) {
-            proto_tree_add_uint_format(tap_tree, hf_radiotap_datarate,
+            proto_tree_add_uint_format_value(tap_tree, hf_radiotap_datarate,
             tvb, offset - 5, 2, tvb_get_letohs(tvb, offset-5),
-            "Data rate: %.1f Mb/s", phyRate);
+            "%.1f Mb/s", phyRate);
         }
     }
     col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%.1f", phyRate);