osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix request for implicit conversion from 'gpointer' to 'struct file_priv_t *' not permitted in C++ 

Change-Id: If88c65fa70d38d6b447a060a19d2681aa7166217
Reviewed-on: https://code.wireshark.org/review/783
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2014-03-22 11:32:25 +01:00 committed by Anders Broman
parent 66719c9b6a
commit 4acdfe3e63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/wslua/wslua_file.c
View File

@ -511,7 +511,7 @@ typedef struct _file_priv_t {
/* create and set the wtap->priv private data for the file instance */
static void create_wth_priv(lua_State* L, wtap *wth) {
file_priv_t *priv = g_malloc(sizeof(file_priv_t));
file_priv_t *priv = (file_priv_t*)g_malloc(sizeof(file_priv_t));
if (wth->priv != NULL) {
luaL_error(L, "Cannot create wtap private data because there already is private data");
@ -587,7 +587,7 @@ static void remove_wth_priv(lua_State* L, wtap *wth) {
/* create and set the wtap_dumper->priv private data for the file instance */
static void create_wdh_priv(lua_State* L, wtap_dumper *wdh) {
file_priv_t *priv = g_malloc(sizeof(file_priv_t));
file_priv_t *priv = (file_priv_t*)g_malloc(sizeof(file_priv_t));
if (wdh->priv != NULL) {
luaL_error(L, "Cannot create wtap_dumper private data because there already is private data");