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

Fix Warnings. 

svn path=/trunk/; revision=39948
This commit is contained in:
Anders Broman 2011-11-19 17:21:35 +00:00
parent 87eafedef0
commit 4b2aa811e1
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-ansi_tcap.c
View File

@ -258,15 +258,15 @@ static GHashTable *TransactionId_table=NULL;
static void
TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U_){
struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata = value;
gchar *TransactionId_str = key;
struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata = (struct ansi_tcap_invokedata_t *)value;
gchar *TransactionId_str = (gchar *)key;
g_free(TransactionId_str);
g_free(ansi_tcap_saved_invokedata);
}
void
static void
ansi_tcap_init_transaction_table(void){
/* Destroy any existing memory chunks / hashes. */
@ -313,11 +313,11 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
}
/* If the entry allready exists don't owervrite it */
ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table,buf);
ansi_tcap_saved_invokedata = (struct ansi_tcap_invokedata_t *)g_hash_table_lookup(TransactionId_table,buf);
if(ansi_tcap_saved_invokedata)
return;
ansi_tcap_saved_invokedata = g_malloc(sizeof(struct ansi_tcap_invokedata_t));
ansi_tcap_saved_invokedata = g_new(struct ansi_tcap_invokedata_t,1);
ansi_tcap_saved_invokedata->OperationCode = ansi_tcap_private.d.OperationCode;
ansi_tcap_saved_invokedata->OperationCode_national = ansi_tcap_private.d.OperationCode_national;
ansi_tcap_saved_invokedata->OperationCode_private = ansi_tcap_private.d.OperationCode_private;
@ -361,7 +361,7 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U
break;
}
ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table, buf);
ansi_tcap_saved_invokedata = (struct ansi_tcap_invokedata_t *)g_hash_table_lookup(TransactionId_table, buf);
if(ansi_tcap_saved_invokedata){
ansi_tcap_private.d.OperationCode = ansi_tcap_saved_invokedata->OperationCode;
ansi_tcap_private.d.OperationCode_national = ansi_tcap_saved_invokedata->OperationCode_national;

18
epan/dissectors/packet-sip.c
View File

@ -888,8 +888,8 @@ typedef struct
/* Equal keys */
static gint sip_equal(gconstpointer v, gconstpointer v2)
{
const sip_hash_key* val1 = v;
const sip_hash_key* val2 = v2;
const sip_hash_key* val1 = (sip_hash_key*)v;
const sip_hash_key* val2 = (sip_hash_key*)v2;
/* Call id must match */
if (strcmp(val1->call_id, val2->call_id) != 0)
@ -1680,7 +1680,7 @@ dissect_sip_reason_header(tvbuff_t *tvb, proto_tree *tree, gint start_offset, gi
}
/* Dissect the details of a Route (and Record-Route) header */
static void dissect_sip_route_header(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, hf_sip_uri_t *sip_route_uri, gint start_offset, gint line_end_offset)
static void dissect_sip_route_header(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, hf_sip_uri_t *sip_route_uri_p, gint start_offset, gint line_end_offset)
{
gint current_offset;
guchar c;
@ -1703,7 +1703,7 @@ static void dissect_sip_route_header(tvbuff_t *tvb, proto_tree *tree, packet_inf
current_offset = dissect_sip_name_addr_or_addr_spec(tvb, pinfo, start_offset, current_offset, &uri_offsets);
if(current_offset == -1)
return;
display_sip_uri(tvb, tree, &uri_offsets, sip_route_uri);
display_sip_uri(tvb, tree, &uri_offsets, sip_route_uri_p);
current_offset++;
start_offset = current_offset + 1;
@ -1713,7 +1713,7 @@ static void dissect_sip_route_header(tvbuff_t *tvb, proto_tree *tree, packet_inf
current_offset = dissect_sip_name_addr_or_addr_spec(tvb, pinfo, start_offset, line_end_offset, &uri_offsets);
if(current_offset == -1)
return;
display_sip_uri(tvb, tree, &uri_offsets, sip_route_uri);
display_sip_uri(tvb, tree, &uri_offsets, sip_route_uri_p);
return;
}
@ -3412,7 +3412,7 @@ static gint sip_is_known_sip_header(gchar *header_name, guint header_len)
/* Compact name is one character long */
if(header_len>1){
pos = GPOINTER_TO_INT(g_hash_table_lookup(sip_headers_hash, header_name));
pos = GPOINTER_TO_UINT(g_hash_table_lookup(sip_headers_hash, header_name));
if (pos!=0)
return pos;
}
@ -3647,7 +3647,7 @@ guint sip_is_packet_resend(packet_info *pinfo,
break;
}
sip_frame_result = p_get_proto_data(pinfo->fd, proto_sip);
sip_frame_result = (sip_frame_result_value *)p_get_proto_data(pinfo->fd, proto_sip);
if (sip_frame_result == NULL)
{
sip_frame_result = se_alloc0(sizeof(sip_frame_result_value));
@ -3750,7 +3750,7 @@ guint sip_find_request(packet_info *pinfo,
/* Store return value with this packet */
sip_frame_result = p_get_proto_data(pinfo->fd, proto_sip);
sip_frame_result = (sip_frame_result_value *)p_get_proto_data(pinfo->fd, proto_sip);
if (sip_frame_result == NULL)
{
/* Allocate and set all values to zero */
@ -3870,7 +3870,7 @@ guint sip_find_invite(packet_info *pinfo,
result = p_val->frame_number;
/* Store return value with this packet */
sip_frame_result = p_get_proto_data(pinfo->fd, proto_sip);
sip_frame_result = (sip_frame_result_value *)p_get_proto_data(pinfo->fd, proto_sip);
if (sip_frame_result == NULL)
{
/* Allocate and set all values to zero */