Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 13 insertions, 13 deletions

diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index a44470ef93..8fe6be739c 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1147,31 +1147,31 @@ void proto_register_ros(void) {
     { &hf_ros_reject,
       { "reject", "ros.reject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_reject", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_bind_invoke,
       { "bind-invoke", "ros.bind_invoke",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_bind_invoke", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_bind_result,
       { "bind-result", "ros.bind_result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_bind_result", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_bind_error,
       { "bind-error", "ros.bind_error",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_bind_error", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_unbind_invoke,
       { "unbind-invoke", "ros.unbind_invoke",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_unbind_invoke", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_unbind_result,
       { "unbind-result", "ros.unbind_result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_unbind_result", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_unbind_error,
       { "unbind-error", "ros.unbind_error",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_unbind_error", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_invokeId,
       { "invokeId", "ros.invokeId",
         FT_UINT32, BASE_DEC, VALS(ros_InvokeId_vals), 0,
@@ -1187,11 +1187,11 @@ void proto_register_ros(void) {
     { &hf_ros_argument,
       { "argument", "ros.argument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_argument", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_result,
       { "result", "ros.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_result", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_operationResult,
       { "result", "ros.result",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1203,11 +1203,11 @@ void proto_register_ros(void) {
     { &hf_ros_parameter,
       { "parameter", "ros.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_problem,
       { "problem", "ros.problem",
         FT_UINT32, BASE_DEC, VALS(ros_T_problem_vals), 0,
-        "T_problem", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_general,
       { "general", "ros.general",
         FT_INT32, BASE_DEC, VALS(ros_GeneralProblem_vals), 0,
@@ -1227,11 +1227,11 @@ void proto_register_ros(void) {
     { &hf_ros_present,
       { "present", "ros.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_present", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_absent,
       { "absent", "ros.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ros_local,
       { "local", "ros.local",
         FT_INT32, BASE_DEC, NULL, 0,