diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-28 15:39:15 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-28 15:39:15 +0000 |
| commit | 9c4e559887ab16f9ddfe1e0b7efb84d8dcfebd31 (patch) | |
| tree | 7eb731520d147eed2ac4e347d49bedfab88aedec /epan/wslua/wslua.h | |
| parent | b3b101e606a6abe8dabd393848cb1f6c0fbd4c56 (diff) | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31716
Diffstat (limited to 'epan/wslua/wslua.h')
| -rw-r--r-- | epan/wslua/wslua.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index ac72856d2b..d12847cb2b 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -246,15 +246,15 @@ typedef struct _wslua_dir* Dir; * (a dummy typedef is used to be syntactically correct) */ #define WSLUA_CLASS_DEFINE(C,check_code,push_code) \ -C to##C(lua_State* L, int index) { \ - C* v = (C*)lua_touserdata (L, index); \ - if (!v) luaL_typerror(L,index,#C); \ +C to##C(lua_State* L, int idx) { \ + C* v = (C*)lua_touserdata (L, idx); \ + if (!v) luaL_typerror(L,idx,#C); \ return *v; \ } \ -C check##C(lua_State* L, int index) { \ +C check##C(lua_State* L, int idx) { \ C* p; \ - luaL_checktype(L,index,LUA_TUSERDATA); \ - p = (C*)luaL_checkudata(L, index, #C); \ + luaL_checktype(L,idx,LUA_TUSERDATA); \ + p = (C*)luaL_checkudata(L, idx, #C); \ check_code; \ return p ? *p : NULL; \ } \ @@ -343,7 +343,7 @@ typedef int dummy##C #define WSLUA_API extern #define NOP -#define FAIL_ON_NULL(s) if (! *p) luaL_argerror(L,index,s) +#define FAIL_ON_NULL(s) if (! *p) luaL_argerror(L,idx,s) /* Clears or marks references that connects Lua to Wireshark structures */ #define CLEAR_OUTSTANDING(C, marker, marker_val) void clear_outstanding_##C(void) { \ @@ -360,8 +360,8 @@ typedef int dummy##C #define WSLUA_CLASS_DECLARE(C) \ -extern C to##C(lua_State* L, int index); \ -extern C check##C(lua_State* L, int index); \ +extern C to##C(lua_State* L, int idx); \ +extern C check##C(lua_State* L, int idx); \ extern C* push##C(lua_State* L, C v); \ extern int C##_register(lua_State* L); \ extern gboolean is##C(lua_State* L,int i); \ |