osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix some "conflicting" value_string warnings. 

copy & paste errors, not 0-terminated value_string arrays, etc.

svn path=/trunk/; revision=42260
This commit is contained in:
Jakub Zawadzki 2012-04-26 14:41:37 +00:00
parent 2cc15fd9c6
commit e2c680b245
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-eigrp.c
View File

@ -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[] = {

4
epan/dissectors/packet-gdsdb.c
View File

@ -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" },

1
epan/dissectors/packet-mip.c
View File

@ -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"},

1
epan/dissectors/packet-mp4ves.c
View File

@ -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)" },

4
epan/dissectors/packet-reload.c
View File

@ -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}
};

6
epan/dissectors/packet-spice.c
View File

@ -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 */