diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-27 23:14:13 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-27 23:14:13 +0000 |
| commit | 8dabc0ded152882834b7c2e53ea46744fce562ba (patch) | |
| tree | dcb943d303c5f8e6ccb3ff93b2f51db8bf1bbe39 /epan/dissectors/packet-msrp.c | |
| parent | fc9e7b97ba547dc1f317e6149516d8901c0da380 (diff) | |
Fix some more warnings under gcc 4.0
svn path=/trunk/; revision=21237
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 88a8f19636..794c8f14fd 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -417,7 +417,7 @@ find_end_line(tvbuff_t *tvb, gint start) if (linelen == -1) { return -1; } - if (tvb_strneql(tvb, next_offset, (const guint8 *)"-------", 7) == 0) + if (tvb_strneql(tvb, next_offset, (const gchar *)"-------", 7) == 0) return next_offset; offset = next_offset; } @@ -513,7 +513,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) token_2_len = space_offset - token_2_start; /* Transaction ID found store it for later use */ - transaction_id_str = tvb_get_ephemeral_string(tvb, token_2_start, token_2_len); + transaction_id_str = (char*)tvb_get_ephemeral_string(tvb, token_2_start, token_2_len); /* Look for another space in this line to indicate a 4th token */ token_3_start = space_offset + 1; @@ -590,7 +590,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reqresp_tree = proto_item_add_subtree(th, ett_msrp_reqresp); proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,FALSE); proto_tree_add_uint(reqresp_tree,hf_msrp_status_code,tvb,token_3_start,token_3_len, - atoi(tvb_get_string(tvb, token_3_start, token_3_len))); + atoi((char*)tvb_get_string(tvb, token_3_start, token_3_len))); }else{ th = proto_tree_add_item(msrp_tree,hf_msrp_request_line,tvb,0,linelen,FALSE); @@ -654,7 +654,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Fetch the value. */ value_len = line_end_offset - value_offset; - value = tvb_get_ephemeral_string(tvb, value_offset, + value = (char*)tvb_get_ephemeral_string(tvb, value_offset, value_len); /* @@ -684,10 +684,10 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) parameter_offset++; content_type_len = semi_colon_offset - value_offset; content_type_parameter_str_len = line_end_offset - parameter_offset; - content_type_parameter_str = tvb_get_ephemeral_string(tvb, parameter_offset, - content_type_parameter_str_len); + content_type_parameter_str = (char*)tvb_get_ephemeral_string(tvb, + parameter_offset, content_type_parameter_str_len); } - media_type_str = tvb_get_ephemeral_string(tvb, value_offset, content_type_len); + media_type_str = (char*)tvb_get_ephemeral_string(tvb, value_offset, content_type_len); #if GLIB_MAJOR_VERSION < 2 media_type_str_lower_case = g_strdup(media_type_str); g_strdown(media_type_str_lower_case); |