diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-14 06:45:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-14 06:45:55 +0000 |
| commit | e022d129bdadd311dd2e344657229d154b5c435e (patch) | |
| tree | b2d76634f7fdb281d461972f77c1a76e3dd3e030 /epan/wslua/wslua.h | |
| parent | 44be81ba93b822dd5f2173d232b936ff4740f7f5 (diff) | |
From beroset:
made implicit casts explicit and changed a number of fields and function return values from base_display_e to unsigned because the enum was not a comprehensive list of all possible values
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48289
Diffstat (limited to 'epan/wslua/wslua.h')
| -rw-r--r-- | epan/wslua/wslua.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index 696bc2dc75..0d33a9f157 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -91,7 +91,7 @@ typedef struct _wslua_field_t { char* abbr; char* blob; enum ftenum type; - base_display_e base; + unsigned base; const void* vs; guint32 mask; } wslua_field_t; @@ -271,7 +271,7 @@ C check##C(lua_State* L, int idx) { \ C* push##C(lua_State* L, C v) { \ C* p; \ luaL_checkstack(L,2,"Unable to grow stack\n"); \ - p = lua_newuserdata(L,sizeof(C)); *p = v; \ + p = (C*)lua_newuserdata(L,sizeof(C)); *p = v; \ luaL_getmetatable(L, #C); lua_setmetatable(L, -2); \ push_code; \ return p; \ @@ -288,7 +288,7 @@ gboolean is##C(lua_State* L,int i) { \ C shift##C(lua_State* L,int i) { \ C* p; \ if(!lua_isuserdata(L,i)) return NULL; \ - p = lua_touserdata(L, i); \ + p = (C*)lua_touserdata(L, i); \ lua_getfield(L, LUA_REGISTRYINDEX, #C); \ if (p == NULL || !lua_getmetatable(L, i) || !lua_rawequal(L, -1, -2)) p=NULL; \ lua_pop(L, 2); \ |