diff options
author | Diego Nehab <diego.nehab@gmail.com> | 2012-04-16 20:41:48 +0800 |
---|---|---|
committer | Diego Nehab <diego.nehab@gmail.com> | 2012-04-16 20:41:48 +0800 |
commit | b3c4f46179ed5b27ca76a824f8730fa50dbaae0b (patch) | |
tree | b5056d95f3307c49d942262387bba2ec3c949451 /src/options.c | |
parent | 4b671f4551e98ac9e1d9a7407d3dffdd7eb1d3dc (diff) | |
download | luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.tar.gz luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.tar.bz2 luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.zip |
merged lua_typerrror.{c,h} into auxiliar.{c,h}
Diffstat (limited to 'src/options.c')
-rw-r--r-- | src/options.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/options.c b/src/options.c index ab9e621..c122ead 100644 --- a/src/options.c +++ b/src/options.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include "auxiliar.h" | 11 | #include "auxiliar.h" |
12 | #include "options.h" | 12 | #include "options.h" |
13 | #include "inet.h" | 13 | #include "inet.h" |
14 | #include "lua_typeerror.h" | ||
15 | 14 | ||
16 | /*=========================================================================*\ | 15 | /*=========================================================================*\ |
17 | * Internal functions prototypes | 16 | * Internal functions prototypes |
@@ -122,7 +121,7 @@ int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) | |||
122 | int opt_set_linger(lua_State *L, p_socket ps) | 121 | int opt_set_linger(lua_State *L, p_socket ps) |
123 | { | 122 | { |
124 | struct linger li; /* obj, name, table */ | 123 | struct linger li; /* obj, name, table */ |
125 | if (!lua_istable(L, 3)) luaL_typeerror(L, 3, lua_typename(L, LUA_TTABLE)); | 124 | if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE)); |
126 | lua_pushstring(L, "on"); | 125 | lua_pushstring(L, "on"); |
127 | lua_gettable(L, 3); | 126 | lua_gettable(L, 3); |
128 | if (!lua_isboolean(L, -1)) | 127 | if (!lua_isboolean(L, -1)) |
@@ -203,7 +202,7 @@ int opt_set_ip6_v6only(lua_State *L, p_socket ps) | |||
203 | static int opt_setmembership(lua_State *L, p_socket ps, int level, int name) | 202 | static int opt_setmembership(lua_State *L, p_socket ps, int level, int name) |
204 | { | 203 | { |
205 | struct ip_mreq val; /* obj, name, table */ | 204 | struct ip_mreq val; /* obj, name, table */ |
206 | if (!lua_istable(L, 3)) luaL_typeerror(L, 3, lua_typename(L, LUA_TTABLE)); | 205 | if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE)); |
207 | lua_pushstring(L, "multiaddr"); | 206 | lua_pushstring(L, "multiaddr"); |
208 | lua_gettable(L, 3); | 207 | lua_gettable(L, 3); |
209 | if (!lua_isstring(L, -1)) | 208 | if (!lua_isstring(L, -1)) |