diff options
| -rw-r--r-- | epan/dissectors/packet-eigrp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-gdsdb.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-mip.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-mp4ves.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-reload.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-spice.c | 6 |
6 files changed, 9 insertions, 11 deletions
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index f7badc0bbb..0faebd301f 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -589,7 +589,7 @@ static const value_string eigrp_vrid2string[] = { { EIGRP_VRID_AF_BASE, "(Address-Family)"}, { EIGRP_VRID_SF_BASE, "(Service-Family)"}, { EIGRP_VRID_MCAST_BASE, "(Multi-Cast)"}, - { -1, NULL} + { 0, NULL} }; static const value_string eigrp_afi2string[] = { @@ -600,7 +600,7 @@ static const value_string eigrp_afi2string[] = { { EIGRP_SF_COMMON, "Service Family"}, { EIGRP_SF_IPv4, "IPv4 Service Family"}, { EIGRP_SF_IPv6, "IPv6 Service Family"}, - { -1, NULL} + { 0, NULL} }; static const value_string eigrp_attr_opcode2string[] = { diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index a7d8bef059..384ea5861d 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -310,7 +310,7 @@ static const value_string gdsdb_opcode[] = { { op_close_blob, "Close blob" }, { op_info_database, "Info database" }, { op_info_request, "Info request" }, - { op_transaction, "Info transaction" }, + { op_info_transaction, "Info transaction" }, { op_info_blob, "Info blob" }, { op_batch_segments, "Batch segments" }, { op_mgr_set_affinity, "Mgr set affinity" }, @@ -347,7 +347,7 @@ static const value_string gdsdb_opcode[] = { { op_execute2, "Execute 2" }, { op_insert, "Insert" }, { op_sql_response, "Sql response" }, - { op_transact_response, "Transact" }, + { op_transact, "Transact" }, { op_transact_response, "Transact response" }, { op_drop_database, "Drop database" }, { op_service_attach, "Service attach" }, diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index e42ae6d771..8b54f6fff8 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -263,7 +263,6 @@ static const value_string mip_ext_types[]= { {128, "Deprecated (2001 Aug 31)"}, {129, "SKIP Firewall Traversal Extension"}, /*[RFC2356]*/ {130, "Encapsulating Delivery Style Extension"}, /*[RFC3024]*/ - {131, "Mobile Node NAI"}, /*[RFC2794]*/ {MN_NAI_EXT, "Mobile Node NAI Extension"}, {MF_CHALLENGE_EXT, "MN-FA Challenge Extension"}, {OLD_NVSE_EXT, "Normal Vendor/Organization Specific Extension"}, diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index e2a008b081..bd08e99555 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -361,7 +361,6 @@ dissect_mp4ves_visual_object_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t */ static const value_string mp4ves_aspect_ratio_info_vals[] = { - { 0x0, "reserved" }, { 0x0, "Forbidden" }, { 0x1, "1:1 (Square)" }, { 0x2, "12:11 (625-type for 4:3 picture)" }, diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 00372e4cd8..fc51f6c781 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -945,9 +945,9 @@ static const value_string datamodels[] = { static const value_string messageextensiontypes[] = { {MESSAGEEXTENSIONTYPE_RESERVED, "reserved"}, - {MESSAGEEXTENSIONTYPE_SELF_TUNING_DATA, "exp-ext"}, + {MESSAGEEXTENSIONTYPE_EXP_EXT, "exp-ext"}, {MESSAGEEXTENSIONTYPE_SELF_TUNING_DATA, "sip_tuning_data"}, - {MESSAGEEXTENSIONTYPE_SELF_TUNING_DATA, "Diagnostic_Ping"}, + {MESSAGEEXTENSIONTYPE_DIAGNOSTIC_PING, "Diagnostic_Ping"}, {0x00, NULL} }; diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 3f463cb88d..fbf5d4bcf8 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -265,9 +265,9 @@ static const value_string agent_clipboard_type[] = { { VD_AGENT_CLIPBOARD_NONE, "NONE" }, { VD_AGENT_CLIPBOARD_UTF8_TEXT, "UTF8_TEXT" }, { VD_AGENT_CLIPBOARD_IMAGE_PNG, "IMAGE_PNG" }, - { VD_AGENT_CLIPBOARD_IMAGE_PNG, "IMAGE_BMP" }, - { VD_AGENT_CLIPBOARD_IMAGE_PNG, "IMAGE_TIFF" }, - { VD_AGENT_CLIPBOARD_IMAGE_PNG, "IMAGE_JPG" }, + { VD_AGENT_CLIPBOARD_IMAGE_BMP, "IMAGE_BMP" }, + { VD_AGENT_CLIPBOARD_IMAGE_TIFF,"IMAGE_TIFF" }, + { VD_AGENT_CLIPBOARD_IMAGE_JPG, "IMAGE_JPG" }, { 0, NULL } }; /* record channel */ |