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

Rename a variable ('free') so checkAPIs doesn't incorrectly flag it. 

svn path=/trunk/; revision=27627
This commit is contained in:
Bill Meier 2009-03-06 22:49:27 +00:00
parent b89f2dd2bc
commit 8c685a67e7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/funnel.h
View File

@ -50,8 +50,8 @@ typedef struct _funnel_bt_t {
funnel_text_window_t* tw;
funnel_bt_cb_t func;
void* data;
void (*free)(void*);
void (*free_data)(void*);
void (*free_fcn)(void*);
void (*free_data_fcn)(void*);
} funnel_bt_t;
typedef struct _funnel_ops_t {

4
epan/wslua/wslua_gui.c
View File

@ -626,8 +626,8 @@ WSLUA_METHOD TextWindow_add_button(lua_State* L) {
fbt->tw = tw->ws_tw;
fbt->func = wslua_button_callback;
fbt->data = cbd;
fbt->free = g_free;
fbt->free_data = g_free;
fbt->free_fcn = g_free;
fbt->free_data_fcn = g_free;
cbd->L = L;
cbd->func_ref = luaL_ref(L, LUA_REGISTRYINDEX);

12
gtk/funnel_stat.c
View File

@ -107,8 +107,8 @@ static void unref_text_win_cancel_bt_cb(GtkWidget *bt _U_, gpointer data) {
for (i = 0; i < tw->buttons->len; i++) {
funnel_bt_t* cbd = g_ptr_array_index(tw->buttons,i);
/* XXX a free cb should be passed somehow */
if (cbd->data && cbd->free_data) cbd->free_data(cbd->data);
if (cbd->free) cbd->free(cbd);
if (cbd->data && cbd->free_data_fcn) cbd->free_data_fcn(cbd->data);
if (cbd->free_fcn) cbd->free_fcn(cbd);
}
g_ptr_array_free(tw->buttons,TRUE);
g_free(tw);
@ -128,8 +128,8 @@ static gboolean text_window_unref_del_event_cb(GtkWidget *win _U_, GdkEvent *eve
for (i = 0; i < tw->buttons->len; i++) {
funnel_bt_t* cbd = g_ptr_array_index(tw->buttons,i);
/* XXX a free cb should be passed somehow */
if (cbd->data && cbd->free_data) cbd->free_data(cbd->data);
if (cbd->free) cbd->free(cbd);
if (cbd->data && cbd->free_data_fcn) cbd->free_data_fcn(cbd->data);
if (cbd->free_fcn) cbd->free_fcn(cbd);
}
g_ptr_array_free(tw->buttons,TRUE);
g_free(tw);
@ -320,8 +320,8 @@ static void text_window_destroy(funnel_text_window_t* tw) {
for (i = 0; i < tw->buttons->len; i++) {
funnel_bt_t* cbd = g_ptr_array_index(tw->buttons,i);
/* XXX a free cb should be passed somehow */
if (cbd->data && cbd->free_data) cbd->free_data(cbd->data);
if (cbd->free) cbd->free(cbd);
if (cbd->data && cbd->free_data_fcn) cbd->free_data_fcn(cbd->data);
if (cbd->free_fcn) cbd->free_fcn(cbd);
}
g_ptr_array_free(tw->buttons,TRUE);
g_free(tw);