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

svn path=/trunk/; revision=28770

1 files changed, 30 insertions, 30 deletions

diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 27d4939ada..fc6701a639 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -4439,7 +4439,7 @@ void proto_register_h282(void) {
         "h282.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h282_h221NonStandard,
       { "h221NonStandard", "h282.h221NonStandard",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.H221NonStandardIdentifier", HFILL }},
     { &hf_h282_key,
       { "key", "h282.key",
@@ -4447,11 +4447,11 @@ void proto_register_h282(void) {
         "h282.Key", HFILL }},
     { &hf_h282_data,
       { "data", "h282.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.OCTET_STRING", HFILL }},
     { &hf_h282_h221nonStandard,
       { "h221nonStandard", "h282.h221nonStandard",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.H221NonStandardIdentifier", HFILL }},
     { &hf_h282_camera,
       { "camera", "h282.camera",
@@ -4487,23 +4487,23 @@ void proto_register_h282(void) {
         "h282.DeviceID", HFILL }},
     { &hf_h282_audioSourceFlag,
       { "audioSourceFlag", "h282.audioSourceFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_audioSinkFlag,
       { "audioSinkFlag", "h282.audioSinkFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_videoSourceFlag,
       { "videoSourceFlag", "h282.videoSourceFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_videoSinkFlag,
       { "videoSinkFlag", "h282.videoSinkFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_remoteControlFlag,
       { "remoteControlFlag", "h282.remoteControlFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_instanceNumber,
       { "instanceNumber", "h282.instanceNumber",
@@ -4519,11 +4519,11 @@ void proto_register_h282(void) {
         "h282.StreamID", HFILL }},
     { &hf_h282_videoStreamFlag,
       { "videoStreamFlag", "h282.videoStreamFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_sourceChangeFlag,
       { "sourceChangeFlag", "h282.sourceChangeFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_streamName,
       { "streamName", "h282.streamName",
@@ -4623,11 +4623,11 @@ void proto_register_h282(void) {
         "h282.PresetNumber", HFILL }},
     { &hf_h282_storeModeSupported,
       { "storeModeSupported", "h282.storeModeSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_presetTextLabel,
       { "presetTextLabel", "h282.presetTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumberOfFilters,
       { "maxNumberOfFilters", "h282.maxNumberOfFilters",
@@ -4647,7 +4647,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_255", HFILL }},
     { &hf_h282_filterTextLabel_01,
       { "filterTextLabel", "h282.filterTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumberOfLens,
       { "maxNumberOfLens", "h282.maxNumberOfLens",
@@ -4667,7 +4667,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_255", HFILL }},
     { &hf_h282_lensTextLabel,
       { "lensTextLabel", "h282.lensTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumber_01,
       { "maxNumber", "h282.maxNumber",
@@ -4687,7 +4687,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_10", HFILL }},
     { &hf_h282_lightLabel,
       { "lightLabel", "h282.lightLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxSpeed,
       { "maxSpeed", "h282.maxSpeed",
@@ -5247,7 +5247,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_10_1000", HFILL }},
     { &hf_h282_multiplyFactor,
       { "multiplyFactor", "h282.multiplyFactor",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_inputDevices,
       { "inputDevices", "h282.inputDevices",
@@ -5407,23 +5407,23 @@ void proto_register_h282(void) {
         "h282.AutoSlideDisplayTime", HFILL }},
     { &hf_h282_continuousRewindControl,
       { "continuousRewindControl", "h282.continuousRewindControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_continuousFastForwardControl,
       { "continuousFastForwardControl", "h282.continuousFastForwardControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_searchBackwardsControl,
       { "searchBackwardsControl", "h282.searchBackwardsControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_searchForwardsControl,
       { "searchForwardsControl", "h282.searchForwardsControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_pause_01,
       { "pause", "h282.pause",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_selectProgram,
       { "selectProgram", "h282.selectProgram",
@@ -5439,7 +5439,7 @@ void proto_register_h282(void) {
         "h282.ProgramDuration", HFILL }},
     { &hf_h282_continuousPlayBackMode,
       { "continuousPlayBackMode", "h282.continuousPlayBackMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_setPlaybackSpeed,
       { "setPlaybackSpeed", "h282.setPlaybackSpeed",
@@ -5447,11 +5447,11 @@ void proto_register_h282(void) {
         "h282.PlaybackSpeed", HFILL }},
     { &hf_h282_play,
       { "play", "h282.play",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_setAudioOutputMute,
       { "setAudioOutputMute", "h282.setAudioOutputMute",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_playToNormalPlayTimePoint,
       { "playToNormalPlayTimePoint", "h282.playToNormalPlayTimePoint",
@@ -5459,7 +5459,7 @@ void proto_register_h282(void) {
         "h282.ProgramDuration", HFILL }},
     { &hf_h282_record,
       { "record", "h282.record",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_recordForDuration,
       { "recordForDuration", "h282.recordForDuration",
@@ -5699,7 +5699,7 @@ void proto_register_h282(void) {
         "h282.PlaybackSpeed", HFILL }},
     { &hf_h282_mute,
       { "mute", "h282.mute",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_currentdeviceState,
       { "currentdeviceState", "h282.currentdeviceState",
@@ -5875,11 +5875,11 @@ void proto_register_h282(void) {
         "h282.NonStandardIdentifier", HFILL }},
     { &hf_h282_deviceLockChanged,
       { "deviceLockChanged", "h282.deviceLockChanged",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_deviceAvailabilityChanged,
       { "deviceAvailabilityChanged", "h282.deviceAvailabilityChanged",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_cameraPannedToLimit,
       { "cameraPannedToLimit", "h282.cameraPannedToLimit",
@@ -5951,7 +5951,7 @@ void proto_register_h282(void) {
         "h282.NULL", HFILL }},
     { &hf_h282_sourceEventNotify,
       { "sourceEventNotify", "h282.sourceEventNotify",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_result_01,
       { "result", "h282.result",
@@ -5979,7 +5979,7 @@ void proto_register_h282(void) {
         "h282.NULL", HFILL }},
     { &hf_h282_lockFlag,
       { "lockFlag", "h282.lockFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_result_03,
       { "result", "h282.result",