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

wslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED 

Ensure that the member cannot be NULL at initialization, simplifies
checkCaptureInfo and checkCaptureInfoConst logic.

Change-Id: I2d9caa4a235310569ebbf0b30199dd3df7a4c093
Reviewed-on: https://code.wireshark.org/review/14791
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2016-04-03 11:10:02 +02:00 committed by Anders Broman
parent f6e223c895
commit e86af3a5fc
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/wslua/wslua.h
View File

@ -645,14 +645,6 @@ extern int wslua_set__index(lua_State *L);
#define FAIL_ON_NULL(s) if (! *p) luaL_argerror(L,idx,"null " s)
#define FAIL_ON_NULL_MEMBER_OR_EXPIRED(s,member) if (!*p) { \
luaL_argerror(L,idx,"null " s); \
} else if ((*p)->member == NULL) { \
luaL_argerror(L,idx,"null " s " member " #member); \
} else if ((*p)->expired) { \
luaL_argerror(L,idx,"expired " s); \
}
#define FAIL_ON_NULL_OR_EXPIRED(s) if (!*p) { \
luaL_argerror(L,idx,"null " s); \
} else if ((*p)->expired) { \

20
epan/wslua/wslua_capture_info.c
View File

@ -34,7 +34,7 @@
/* WSLUA_CONTINUE_MODULE File */
WSLUA_CLASS_DEFINE(CaptureInfo,FAIL_ON_NULL_MEMBER_OR_EXPIRED("CaptureInfo",wth));
WSLUA_CLASS_DEFINE(CaptureInfo,FAIL_ON_NULL_OR_EXPIRED("CaptureInfo"));
/*
A `CaptureInfo` object, passed into Lua as an argument by `FileHandler` callback
function `read_open()`, `read()`, `seek_read()`, `seq_read_close()`, and `read_close()`.
@ -50,7 +50,13 @@ WSLUA_CLASS_DEFINE(CaptureInfo,FAIL_ON_NULL_MEMBER_OR_EXPIRED("CaptureInfo",wth)
*/
CaptureInfo* push_CaptureInfo(lua_State* L, wtap *wth, const gboolean first_time) {
CaptureInfo f = (CaptureInfo) g_malloc0(sizeof(struct _wslua_captureinfo));
CaptureInfo f;
if (!wth) {
luaL_error(L, "Internal error: wth is NULL!");
}
f = (CaptureInfo) g_malloc0(sizeof(struct _wslua_captureinfo));
f->wth = wth;
f->wdh = NULL;
f->expired = FALSE;
@ -300,7 +306,7 @@ int CaptureInfo_register(lua_State* L) {
}
WSLUA_CLASS_DEFINE(CaptureInfoConst,FAIL_ON_NULL_MEMBER_OR_EXPIRED("CaptureInfoConst",wdh));
WSLUA_CLASS_DEFINE(CaptureInfoConst,FAIL_ON_NULL_OR_EXPIRED("CaptureInfoConst"));
/*
A `CaptureInfoConst` object, passed into Lua as an argument to the `FileHandler` callback
function `write_open()`.
@ -317,7 +323,13 @@ WSLUA_CLASS_DEFINE(CaptureInfoConst,FAIL_ON_NULL_MEMBER_OR_EXPIRED("CaptureInfoC
*/
CaptureInfoConst* push_CaptureInfoConst(lua_State* L, wtap_dumper *wdh) {
CaptureInfoConst f = (CaptureInfoConst) g_malloc0(sizeof(struct _wslua_captureinfo));
CaptureInfoConst f;
if (!wdh) {
luaL_error(L, "Internal error: wdh is NULL!");
}
f = (CaptureInfoConst) g_malloc0(sizeof(struct _wslua_captureinfo));
f->wth = NULL;
f->wdh = wdh;
f->expired = FALSE;