diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-16 08:12:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-16 08:12:29 +0000 |
| commit | 27744ecc2d9925491e5ef8cc97e41d551efc6a2e (patch) | |
| tree | 6aba5a4a5dc7c11be8982099065f85f32665f968 /epan/wslua/init_wslua.c | |
| parent | 1931018a58a1ce88969cc95fac47810b8b70c1ed (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48337
Diffstat (limited to 'epan/wslua/init_wslua.c')
| -rw-r--r-- | epan/wslua/init_wslua.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index 046104c472..286d91bfe5 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -68,7 +68,7 @@ int dissect_lua(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data lua_pinfo = pinfo; lua_tvb = tvb; - lua_tree = g_malloc(sizeof(struct _wslua_treeitem)); + lua_tree = (struct _wslua_treeitem *)g_malloc(sizeof(struct _wslua_treeitem)); lua_tree->tree = tree; lua_tree->item = proto_tree_add_text(tree,tvb,0,0,"lua fake item"); lua_tree->expired = FALSE; @@ -332,12 +332,13 @@ int wslua_init(register_cb cb, gpointer client_data) { (*cb)(RA_LUA_PLUGINS, NULL, client_data); /* set up the logger */ - g_log_set_handler(LOG_DOMAIN_LUA, G_LOG_LEVEL_CRITICAL| + g_log_set_handler(LOG_DOMAIN_LUA, (GLogLevelFlags)(G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE| G_LOG_LEVEL_INFO| - G_LOG_LEVEL_DEBUG, - ops ? ops->logger : basic_logger, NULL); + G_LOG_LEVEL_DEBUG), + ops ? ops->logger : basic_logger, + NULL); if (!L) { L = luaL_newstate(); |