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

Use explicit casts. 

svn path=/trunk/; revision=48212
This commit is contained in:
Anders Broman 2013-03-09 10:09:58 +00:00
parent f6019d9d88
commit 97c4bc6292
9 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
epan/dissectors/packet-smb2.c
View File

@ -704,7 +704,7 @@ feed_eo_smb2(tvbuff_t * tvb,packet_info *pinfo,smb2_info_t * si, guint16 dataoff
/* Create a new tvb to point to the payload data */
data_tvb = tvb_new_subset(tvb, dataoffset, length, length);
/* Create the eo_info to pass to the listener */
eo_info = ep_alloc(sizeof(smb_eo_t));
eo_info = ep_new(smb_eo_t);
/* Fill in eo_info */
eo_info->smbversion=2;
/* cmd == opcode */
@ -1374,10 +1374,10 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
if (si->saved) { si->saved->policy_hnd = policy_hnd; }
if (si->conv) {
eo_file_info = g_hash_table_lookup(si->conv->files,&policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->conv->files,&policy_hnd);
if (!eo_file_info) {
eo_file_info = se_alloc(sizeof(smb2_eo_file_info_t));
policy_hnd_hashtablekey = se_alloc(sizeof(e_ctx_hnd));
eo_file_info = se_new(smb2_eo_file_info_t);
policy_hnd_hashtablekey = se_new(e_ctx_hnd);
memcpy(policy_hnd_hashtablekey, &policy_hnd, sizeof(e_ctx_hnd));
eo_file_info->end_of_file=0;
g_hash_table_insert(si->conv->files,policy_hnd_hashtablekey,eo_file_info);
@ -1414,7 +1414,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
if (!si->eo_file_info) {
if (si->saved) { si->saved->policy_hnd = policy_hnd; }
if (si->conv) {
eo_file_info = g_hash_table_lookup(si->conv->files,&policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->conv->files,&policy_hnd);
if (eo_file_info) {
si->eo_file_info=eo_file_info;
} else { /* XXX This should never happen */
@ -2461,7 +2461,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if (ntlmssph && ntlmssph->type == NTLMSSP_AUTH) {
static const gint8 zeros[NTLMSSP_KEY_LEN];
smb2_sesid_info_t *sesid;
sesid = se_alloc(sizeof(smb2_sesid_info_t));
sesid = se_new(smb2_sesid_info_t);
sesid->sesid = si->sesid;
sesid->acct_name = se_strdup(ntlmssph->acct_name);
sesid->domain_name = se_strdup(ntlmssph->domain_name);
@ -2607,11 +2607,11 @@ dissect_smb2_tree_connect_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree
smb2_tid_info_t *tid, tid_key;
tid_key.tid = si->tid;
tid = g_hash_table_lookup(si->session->tids, &tid_key);
tid = (smb2_tid_info_t *)g_hash_table_lookup(si->session->tids, &tid_key);
if (tid) {
g_hash_table_remove(si->session->tids, &tid_key);
}
tid = se_alloc(sizeof(smb2_tid_info_t));
tid = se_new(smb2_tid_info_t);
tid->tid = si->tid;
tid->name = (char *)si->saved->extra_info;
tid->connect_frame = pinfo->fd->num;
@ -6545,7 +6545,7 @@ dissect_smb2_transform_header(packet_info *pinfo _U_, proto_tree *tree,
/* now we need to first lookup the uid session */
sesid_key.sesid = sti->sesid;
sti->session = g_hash_table_lookup(sti->conv->sesids, &sesid_key);
sti->session = (smb2_sesid_info_t *)g_hash_table_lookup(sti->conv->sesids, &sesid_key);
if (sti->session != NULL && sti->session->auth_frame != (guint32)-1) {
item = proto_tree_add_string(sesid_tree, hf_smb2_acct_name, tvb, sesid_offset, 0, sti->session->acct_name);
@ -6588,7 +6588,7 @@ dissect_smb2_transform_header(packet_info *pinfo _U_, proto_tree *tree,
memcpy(&A_1[1], sti->nonce, 15 - 4);
plain_data = tvb_memdup(tvb, offset, sti->size);
plain_data = (guint8 *)tvb_memdup(tvb, offset, sti->size);
/* Open the cipher. */
if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CTR, 0)) {
@ -6711,7 +6711,7 @@ dissect_smb2_tid_sesid(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb,
/* now we need to first lookup the uid session */
sesid_key.sesid = si->sesid;
si->session = g_hash_table_lookup(si->conv->sesids, &sesid_key);
si->session = (smb2_sesid_info_t *)g_hash_table_lookup(si->conv->sesids, &sesid_key);
if (!si->session) {
if (si->opcode != 0x03) return offset;
@ -6719,7 +6719,7 @@ dissect_smb2_tid_sesid(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb,
* a tree connect, we create a dummy sessison, so we can hang the
* tree data on it
*/
si->session = se_alloc(sizeof(smb2_sesid_info_t));
si->session = se_new(smb2_sesid_info_t);
si->session->sesid = si->sesid;
si->session->acct_name = NULL;
si->session->domain_name = NULL;
@ -6987,12 +6987,12 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea
}
} else {
/* see if we can find this seqnum in the matched table */
ssi = g_hash_table_lookup(si->conv->matched, &ssi_key);
ssi = (smb2_saved_info_t *)g_hash_table_lookup(si->conv->matched, &ssi_key);
/* if we couldnt find it in the matched table, it might still
* be in the unmatched table
*/
if (!ssi) {
ssi = g_hash_table_lookup(si->conv->unmatched, &ssi_key);
ssi = (smb2_saved_info_t *)g_hash_table_lookup(si->conv->unmatched, &ssi_key);
}
}
@ -7001,11 +7001,11 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea
/* If needed, create the file entry and save the policy hnd */
if (!si->eo_file_info) {
if (si->conv) {
eo_file_info = g_hash_table_lookup(si->conv->files,&ssi->policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->conv->files,&ssi->policy_hnd);
if (!eo_file_info) { /* XXX This should never happen */
/* assert(1==0); */
eo_file_info = se_alloc(sizeof(smb2_eo_file_info_t));
policy_hnd_hashtablekey = se_alloc(sizeof(e_ctx_hnd));
eo_file_info = se_new(smb2_eo_file_info_t);
policy_hnd_hashtablekey = se_new(e_ctx_hnd);
memcpy(policy_hnd_hashtablekey, &ssi->policy_hnd, sizeof(e_ctx_hnd));
eo_file_info->end_of_file=0;
g_hash_table_insert(si->conv->files,policy_hnd_hashtablekey,eo_file_info);

2
ui/gtk/decode_as_ber.c
View File

@ -62,7 +62,7 @@ decode_ber(GtkWidget *notebook_pg)
GtkTreeIter iter;
syntax = NULL;
list = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
list = (GtkWidget *)g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
if (requested_action == E_DECODE_NO)
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)));

2
ui/gtk/dfilter_expr_dlg.c
View File

@ -96,7 +96,7 @@ static void display_value_fields(header_field_info *hfinfo,
static void
field_select_row_cb(GtkTreeSelection *sel, gpointer tree)
{
GtkWidget *window = (GtkWidget *)gtk_widget_get_toplevel(tree);
GtkWidget *window = (GtkWidget *)gtk_widget_get_toplevel((GtkWidget *)tree);
GtkWidget *relation_list = (GtkWidget *)g_object_get_data(G_OBJECT(window),
E_DFILTER_EXPR_RELATION_LIST_KEY);
GtkWidget *range_label = (GtkWidget *)g_object_get_data(G_OBJECT(window),

14
ui/gtk/dissector_tables_dlg.c
View File

@ -125,8 +125,8 @@ decode_proto_add_to_list (const gchar *table_name _U_, ftenum_t selector_type,
gchar *str;
dissector_tables_tree_info_t *tree_info;
tree_info = user_data;
dtbl_entry = value;
tree_info = (dissector_tables_tree_info_t *)user_data;
dtbl_entry = (dtbl_entry_t*)value;
handle = dtbl_entry_get_handle(dtbl_entry);
proto_name = dissector_handle_get_short_name(handle);
@ -177,8 +177,8 @@ table_name_add_to_list(dissector_tables_tree_info_t *tree_info,
static void
display_heur_dissector_table_entries(gpointer data, gpointer user_data)
{
heur_dtbl_entry_t *dtbl_entry = data;
dissector_tables_tree_info_t *tree_info = user_data;
heur_dtbl_entry_t *dtbl_entry = (heur_dtbl_entry_t *)data;
dissector_tables_tree_info_t *tree_info = (dissector_tables_tree_info_t*)user_data;
GtkTreeStore *store;
if(dtbl_entry->protocol){
@ -202,8 +202,8 @@ display_heur_dissector_table_names(const char *table_name, gpointer table, gpoin
heur_dissector_list_t *list;
tree_info = g_new(dissector_tables_tree_info_t, 1);
dis_tbl_trees = w;
list = table;
dis_tbl_trees = (dissector_tables_trees_t*)w;
list = (heur_dissector_list_t *)table;
table_name_add_to_list(tree_info, dis_tbl_trees->heuristic_tree_wgt, "", table_name);
@ -221,7 +221,7 @@ display_dissector_table_names(const char *table_name, const char *ui_name, gpoin
ftenum_t selector_type = get_dissector_table_selector_type(table_name);
tree_info = g_new(dissector_tables_tree_info_t, 1);
dis_tbl_trees = w;
dis_tbl_trees = (dissector_tables_trees_t*)w;
switch (selector_type) {
case FT_UINT8:

10
ui/gtk/dlg_utils.c
View File

@ -68,12 +68,12 @@ dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) {
if (!hbox)
return;
button_hbox = g_object_get_data(G_OBJECT(hbox), BUTTON_HBOX_KEY);
button_hbox = (GtkWidget *)g_object_get_data(G_OBJECT(hbox), BUTTON_HBOX_KEY);
children = gtk_container_get_children(GTK_CONTAINER(button_hbox));
while (children) {
if (cur_item == focus_item) {
button = children->data;
button = (GtkWidget *)children->data;
gtk_widget_grab_focus(button);
gtk_widget_grab_default(button);
break;
@ -118,7 +118,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
const gchar *closex = NULL;
const gchar *copy = NULL;
const gchar *create_stat = NULL;
const gchar *delete = NULL;
const gchar *delete_id = NULL;
const gchar *dont_save = NULL;
const gchar *filter_stream = NULL;
const gchar *find = NULL;
@ -207,7 +207,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
} else if (strcmp(stock_id, WIRESHARK_STOCK_FILTER_OUT_STREAM) == 0) {
filter_stream = stock_id;
} else if (strcmp(stock_id, GTK_STOCK_DELETE) == 0) {
delete = stock_id;
delete_id = stock_id;
} else if (strcmp(stock_id, GTK_STOCK_COPY) == 0) {
copy = stock_id;
} else if (strcmp(stock_id, WIRESHARK_STOCK_GRAPH_A_B) == 0) {
@ -415,7 +415,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
/* beware: sequence of buttons is important! */
if (ok != NULL) dlg_button_new(hbox, button_hbox, ok);
if (delete != NULL) dlg_button_new(hbox, button_hbox, delete);
if (delete_id != NULL) dlg_button_new(hbox, button_hbox, delete_id);
if (jump != NULL) dlg_button_new(hbox, button_hbox, jump);
if (find != NULL) dlg_button_new(hbox, button_hbox, find);
if (print != NULL) dlg_button_new(hbox, button_hbox, print);

4
ui/gtk/drag_and_drop.c
View File

@ -231,7 +231,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme)
return;
}
in_filenames = g_malloc(sizeof(char*) * in_files);
in_filenames = (char **)g_malloc(sizeof(char*) * in_files);
/* store the starts of the file entries in a gchar array */
cf_name = cf_names_freeme;
@ -324,7 +324,7 @@ dnd_data_received(GtkWidget *widget _U_, GdkDragContext *dc _U_, gint x _U_, gin
/* the data string is not zero terminated -> make a zero terminated "copy" of it */
sel_data_len = gtk_selection_data_get_length(selection_data);
sel_data_data = gtk_selection_data_get_data(selection_data);
cf_names_freeme = g_malloc(sel_data_len + 1);
cf_names_freeme = (gchar *)g_malloc(sel_data_len + 1);
memcpy(cf_names_freeme, sel_data_data, sel_data_len);
cf_names_freeme[sel_data_len] = '\0';

10
ui/gtk/edit_packet_comment_dlg.c
View File

@ -147,14 +147,14 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
ok_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
g_signal_connect (ok_bt, "clicked", G_CALLBACK(pkt_comment_text_buff_ok_cb), view);
gtk_widget_set_sensitive (ok_bt, TRUE);
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
cancel_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button (edit_or_add_pkt_comment_dlg, cancel_bt, window_cancel_button_cb);
help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
#if 0
g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL);
#endif
@ -233,14 +233,14 @@ edit_capture_comment_dlg_launch (void)
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
ok_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
g_signal_connect (ok_bt, "clicked", G_CALLBACK(capture_comment_text_buff_ok_cb), view);
gtk_widget_set_sensitive (ok_bt, TRUE);
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button (edit_or_add_capture_comment_dlg, cancel_bt, window_cancel_button_cb);
help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
#if 0
g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL);
#endif

4
ui/gtk/expert_comp_table.c
View File

@ -217,7 +217,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
return;
}
}
msg = g_malloc(escape_string_len(procedure->entries[1]));
msg = (char *)g_malloc(escape_string_len(procedure->entries[1]));
escape_string(msg, procedure->entries[1]);
switch(type){
case ACTYPE_SELECTED:
@ -345,7 +345,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
static gboolean
error_show_popup_menu_cb(void *widg _U_, GdkEvent *event, gpointer user_data)
{
error_equiv_table *err = user_data;
error_equiv_table *err = (error_equiv_table *)user_data;
GdkEventButton *bevent = (GdkEventButton *)event;
if(event->type==GDK_BUTTON_PRESS && bevent->button==3){

34
ui/gtk/export_object_dlg.c
View File

@ -77,7 +77,7 @@ static void
eo_remember_this_row(GtkTreeModel *model _U_, GtkTreePath *path,
GtkTreeIter *iter _U_, gpointer arg)
{
export_object_list_t *object_list = arg;
export_object_list_t *object_list = (export_object_list_t *)arg;
export_object_entry_t *entry;
gint *path_index;
@ -89,7 +89,7 @@ eo_remember_this_row(GtkTreeModel *model _U_, GtkTreePath *path,
object_list->row_selected = path_index[0];
/* Select the corresponding packet in the packet list */
entry = g_slist_nth_data(object_list->entries,
entry = (export_object_entry_t *)g_slist_nth_data(object_list->entries,
object_list->row_selected);
cf_goto_frame(&cfile, entry->pkt_num);
}
@ -105,7 +105,7 @@ eo_remember_row_num(GtkTreeSelection *sel, gpointer data)
static void
eo_win_destroy_cb(GtkWindow *win _U_, gpointer data)
{
export_object_list_t *object_list = data;
export_object_list_t *object_list = (export_object_list_t *)data;
export_object_entry_t *entry;
GSList *slist = object_list->entries;
@ -113,7 +113,7 @@ eo_win_destroy_cb(GtkWindow *win _U_, gpointer data)
/* Free the GSList attributes */
while(slist) {
entry = slist->data;
entry = (export_object_entry_t *)slist->data;
g_free(entry->hostname);
g_free(entry->content_type);
@ -156,12 +156,12 @@ static void
eo_save_clicked_cb(GtkWidget *widget _U_, gpointer arg)
{
GtkWidget *save_as_w;
export_object_list_t *object_list = arg;
export_object_list_t *object_list = (export_object_list_t *)arg;
export_object_entry_t *entry;
gchar *filename = NULL;
gchar *auxfilename = NULL;
entry = g_slist_nth_data(object_list->entries,
entry =(export_object_entry_t *) g_slist_nth_data(object_list->entries,
object_list->row_selected);
if(!entry) {
@ -196,7 +196,7 @@ static void
eo_save_all_clicked_cb(GtkWidget *widget _U_, gpointer arg)
{
gchar *save_as_fullpath = NULL;
export_object_list_t *object_list = arg;
export_object_list_t *object_list = (export_object_list_t *)arg;
export_object_entry_t *entry;
GtkWidget *save_in_w;
GSList *slist = object_list->entries;
@ -214,7 +214,7 @@ eo_save_all_clicked_cb(GtkWidget *widget _U_, gpointer arg)
if (gtk_dialog_run(GTK_DIALOG(save_in_w)) == GTK_RESPONSE_ACCEPT) {
while (slist) {
entry = slist->data;
entry = (export_object_entry_t *)slist->data;
save_in_path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_in_w));
if ((strlen(save_in_path) < MAXFILELEN)) {
@ -263,7 +263,7 @@ eo_save_all_clicked_cb(GtkWidget *widget _U_, gpointer arg)
static void
eo_reset(void *tapdata)
{
export_object_list_t *object_list = tapdata;
export_object_list_t *object_list = (export_object_list_t *)tapdata;
object_list->entries = NULL;
object_list->iter = NULL;
@ -275,7 +275,7 @@ eo_reset(void *tapdata)
static void
eo_draw(void *tapdata)
{
export_object_list_t *object_list = tapdata;
export_object_list_t *object_list = (export_object_list_t *)tapdata;
export_object_entry_t *eo_entry;
gchar *size_str;
@ -289,7 +289,7 @@ eo_draw(void *tapdata)
gtk_tree_store_clear(object_list->store);
while(slist) {
eo_entry = slist->data;
eo_entry = (export_object_entry_t *)slist->data;
gtk_tree_store_append(object_list->store, &new_iter,
object_list->iter);
@ -314,7 +314,7 @@ void object_list_add_entry(export_object_list_t *object_list, export_object_entr
}
export_object_entry_t *object_list_get_entry(export_object_list_t *object_list, int row) {
return g_slist_nth_data(object_list->entries, row);
return (export_object_entry_t *)g_slist_nth_data(object_list->entries, row);
}
static void
@ -333,7 +333,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_
eo_protocoldata_reset = eo_protocoldata_resetfn;
/* Initialize our object list structure */
object_list = g_malloc0(sizeof(export_object_list_t));
object_list = g_new0(export_object_list_t,1);
/* Data will be gathered via a tap callback */
error_msg = register_tap_listener(tapname, object_list, NULL, 0,
@ -433,23 +433,23 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_
bbox = dlg_button_row_new(GTK_STOCK_HELP, WIRESHARK_STOCK_SAVE_ALL, GTK_STOCK_SAVE_AS, GTK_STOCK_CANCEL, NULL);
/* Help button */
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_OBJECT_LIST);
gtk_widget_set_tooltip_text(help_bt, "Show help for this dialog.");
/* Save All button */
save_all_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_SAVE_ALL);
save_all_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_SAVE_ALL);
g_signal_connect(save_all_bt, "clicked", G_CALLBACK(eo_save_all_clicked_cb),
object_list);
gtk_widget_set_tooltip_text(save_all_bt, "Save all listed objects with their displayed filenames.");
/* Save As button */
save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE_AS);
save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE_AS);
g_signal_connect(save_bt, "clicked", G_CALLBACK(eo_save_clicked_cb), object_list);
gtk_widget_set_tooltip_text(save_bt, "Saves the currently selected content to a file.");
/* Cancel button */
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
gtk_widget_set_tooltip_text(cancel_bt, "Cancel this dialog.");
/* Pack the buttons into the "button box" */