osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix 

cc1: warnings being treated as errors
packet-cip.c: In function 'dissect_cip_generic_service_req':
packet-cip.c:3281: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_generic_service_rsp':
packet-cip.c:3631: warning: format not a string literal and no format arguments
packet-cip.c: In function 'dissect_cip_data':
packet-cip.c:4881: warning: comparison between signed and unsigned

svn path=/trunk/; revision=39599
This commit is contained in:
Anders Broman 2011-10-26 06:14:53 +00:00
parent 7fe61d81e4
commit 2d9d7449b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3277,7 +3277,7 @@ dissect_cip_generic_service_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
val_to_str(service, cip_sc_vals , "Unknown Service (0x%02x)") );
/* Create service tree */
cmd_data_item = proto_tree_add_text(tree, tvb, 0, tvb_length(tvb),
cmd_data_item = proto_tree_add_text(tree, tvb, 0, tvb_length(tvb), "%s",
val_to_str(service, cip_sc_vals , "Unknown Service (0x%02x)"));
proto_item_append_text(cmd_data_item, " (Request)");
cmd_data_tree = proto_item_add_subtree( cmd_data_item, ett_cmd_data );
@ -3627,7 +3627,7 @@ dissect_cip_generic_service_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
/* If there is any command specific data create a sub-tree for it */
if( (item_length-4-add_stat_size ) != 0 )
{
cmd_data_item = proto_tree_add_text(tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size,
cmd_data_item = proto_tree_add_text(tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, "%s",
val_to_str(service, cip_sc_vals , "Unknown Service (0x%02x)"));
proto_item_append_text(cmd_data_item, " (Response)");
cmd_data_tree = proto_item_add_subtree( cmd_data_item, ett_cmd_data );
@ -4878,7 +4878,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info
dissector = NULL;
/* The class ID should already be extracted if its available */
if (path_info.iClass != -1)
if (path_info.iClass != 0xFFFFFFFF)
{
dissector = dissector_get_uint_handle( subdissector_class_table, path_info.iClass);
}