From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero


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

1 files changed, 9 insertions, 12 deletions

diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index bdd77917d7..e3529e0f84 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -8747,7 +8747,7 @@ void proto_register_rtps2(void) {
         "guidPrefix",
         "rtps2.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
         "GuidPrefix of the RTPS packet",
@@ -8832,11 +8832,10 @@ void proto_register_rtps2(void) {
         "guidPrefix",
         "rtps2.sm.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
-        "a generic guidPrefix that is transmitted inside the submessage "
-        "(this is NOT the guidPrefix described in the packet header",
+        "a generic guidPrefix that is transmitted inside the submessage (this is NOT the guidPrefix described in the packet header",
         HFILL }
     },
 
@@ -9033,8 +9032,7 @@ void proto_register_rtps2(void) {
         BASE_HEX, 
         NULL,
         0,
-        "State information of the data object to which the message apply"
-        " (i.e. lifecycle)", 
+        "State information of the data object to which the message apply (i.e. lifecycle)", 
         HFILL }
     },
 
@@ -9104,8 +9102,7 @@ void proto_register_rtps2(void) {
         BASE_DEC, 
         NULL,
         0,
-        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH "
-        "parameter", 
+        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH parameter", 
         HFILL }
     },
 
@@ -9126,7 +9123,7 @@ void proto_register_rtps2(void) {
         "userData", 
         "rtps2.param.userData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_USER_DATA parameter", 
@@ -9138,7 +9135,7 @@ void proto_register_rtps2(void) {
         "groupData", 
         "rtps2.param.groupData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_GROUP_DATA parameter", 
@@ -9150,7 +9147,7 @@ void proto_register_rtps2(void) {
         "topicData", 
         "rtps2.param.topicData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_TOPIC_DATA parameter", 
@@ -9195,7 +9192,7 @@ void proto_register_rtps2(void) {
         "serializedData", 
         "rtps2.serializedData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data transferred in a ISSUE submessage",