Remove warnings and fix makefile for Win32.

8 files changed, 30 insertions, 36 deletions

diff --git a/src/buffer.c b/src/buffer.c
index d8facd2..4ef4e8e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -51,8 +51,8 @@ void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
 * object:getstats() interface
 \*-------------------------------------------------------------------------*/
 int buffer_meth_getstats(lua_State *L, p_buffer buf) {
-    lua_pushnumber(L, buf->received);
-    lua_pushnumber(L, buf->sent);
+    lua_pushnumber(L, (lua_Number) buf->received);
+    lua_pushnumber(L, (lua_Number) buf->sent);
     lua_pushnumber(L, timeout_gettime() - buf->birthday);
     return 3;
 }
@@ -61,8 +61,8 @@ int buffer_meth_getstats(lua_State *L, p_buffer buf) {
 * object:setstats() interface
 \*-------------------------------------------------------------------------*/
 int buffer_meth_setstats(lua_State *L, p_buffer buf) {
-    buf->received = (long) luaL_optnumber(L, 2, buf->received); 
-    buf->sent = (long) luaL_optnumber(L, 3, buf->sent); 
+    buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received); 
+    buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent); 
     if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4);
     lua_pushnumber(L, 1);
     return 1;
@@ -90,9 +90,9 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
     if (err != IO_DONE) {
         lua_pushnil(L);
         lua_pushstring(L, buf->io->error(buf->io->ctx, err)); 
-        lua_pushnumber(L, sent+start-1);
+        lua_pushnumber(L, (lua_Number) (sent+start-1));
     } else {
-        lua_pushnumber(L, sent+start-1);
+        lua_pushnumber(L, (lua_Number) (sent+start-1));
         lua_pushnil(L);
         lua_pushnil(L);
     }
diff --git a/src/inet.c b/src/inet.c
index 52f7397..69d32e6 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -105,8 +105,8 @@ static int inet_global_getnameinfo(lua_State *L) {
 
     lua_newtable(L);
     for (i = 1, iter = resolved; iter; i++, iter = iter->ai_next) {
-        getnameinfo(iter->ai_addr, iter->ai_addrlen, host,
-            node ? sizeof(host) : 0, serv, service ? sizeof(serv) : 0, 0);
+        getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen, host,
+            node ? (socklen_t) sizeof(host) : 0, serv, service ? (socklen_t) sizeof(serv) : 0, 0);
 
         if (node) {
             lua_pushnumber(L, i);
@@ -177,8 +177,8 @@ static int inet_global_getaddrinfo(lua_State *L)
     lua_newtable(L);
     for (iterator = resolved; iterator; iterator = iterator->ai_next) {
         char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-        getnameinfo(iterator->ai_addr, iterator->ai_addrlen, hbuf, 
-            sizeof(hbuf), sbuf, 0, NI_NUMERICHOST);
+        getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen, hbuf, 
+            (socklen_t) sizeof(hbuf), sbuf, 0, NI_NUMERICHOST);
         lua_pushnumber(L, i);
         lua_newtable(L);
         switch (iterator->ai_family) {
@@ -413,7 +413,7 @@ const char *inet_tryconnect(p_socket ps, const char *address,
         timeout_markstart(tm);
         /* try connecting to remote address */
         err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr, 
-            iterator->ai_addrlen, tm));
+            (socklen_t) iterator->ai_addrlen, tm));
         /* if success, break out of loop */
         if (err == NULL) break;
     }
@@ -463,7 +463,7 @@ const char *inet_trybind(p_socket ps, const char *address, const char *serv,
         /* try binding to local address */
         err = socket_strerror(socket_bind(&sock,
             (SA *) iterator->ai_addr,
-            iterator->ai_addrlen));
+            (socklen_t) iterator->ai_addrlen));
 
         /* keep trying unless bind succeeded */
         if (err) {
diff --git a/src/makefile b/src/makefile
index 42b745e..a75d5a6 100644
--- a/src/makefile
+++ b/src/makefile
@@ -114,7 +114,7 @@ SOCKET_macosx=usocket.o
 SO_linux=so
 O_linux=o
 CC_linux=gcc
-DEF_linux=-DLUASOCKET_$(DEBUG) \
+DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE \
         -DLUASOCKET_API='__attribute__((visibility("default")))' \
         -DMIME_API='__attribute__((visibility("default")))'
 CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra -Wimplicit -O2 -ggdb3 -fpic \
@@ -130,11 +130,12 @@ SO_win32=dll
 O_win32=obj
 CC_win32=cl
 DEF_win32= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \
-     /D "LUASOCKET_API=__declspec(dllexport)" /D "LUASOCKET_$(DEBUG)" \
-     /D "_CRT_SECURE_NO_WARNINGS" /D "_WINDLL"
-CFLAGS_win32=/I$(LUAINC) $(DEF) /O2 /Ot /MD /W3 /nologo
+     /D "LUASOCKET_API=__declspec(dllexport)" /D "_CRT_SECURE_NO_WARNINGS" \
+     /D "_WINDLL" /D "LUA_COMPAT_MODULE" /D "MIME_API=__declspec(dllexport)" \
+     /D "LUASOCKET_$(DEBUG)" 
+CFLAGS_win32=/I "$(LUAINC)" $(DEF) /O2 /Ot /MD /W3 /nologo
 LDFLAGS_win32= /nologo /link /NOLOGO /DLL /INCREMENTAL:NO \
-    /LIBPATH:$(LUALIB) \
+    /LIBPATH:"$(LUALIB)" \
     /MANIFEST \
     /MANIFESTFILE:"intermediate.manifest" \
     /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
diff --git a/src/mime.c b/src/mime.c
index 06e5132..dddd3d6 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -504,7 +504,7 @@ static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
             c = qpunbase[input[1]]; d = qpunbase[input[2]];
             /* if it is an invalid, do not decode */
             if (c > 15 || d > 15) luaL_addlstring(buffer, (char *)input, 3);
-            else luaL_addchar(buffer, (c << 4) + d);
+            else luaL_addchar(buffer, (char) ((c << 4) + d));
             return 0;
         case '\r':
             if (size < 2) return size; 
@@ -642,7 +642,7 @@ static int eolprocess(int c, int last, const char *marker,
             return c;
         }
     } else {
-        luaL_addchar(buffer, c);
+        luaL_addchar(buffer, (char) c);
         return 0;
     }
 }
@@ -682,7 +682,7 @@ static int mime_global_eol(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static size_t dot(int c, size_t state, luaL_Buffer *buffer)
 {
-    luaL_addchar(buffer, c);
+    luaL_addchar(buffer, (char) c);
     switch (c) {
         case '\r': 
             return 1;
@@ -717,7 +717,7 @@ static int mime_global_dot(lua_State *L)
     while (input < last) 
         state = dot(*input++, state, &buffer);
     luaL_pushresult(&buffer);
-    lua_pushnumber(L, state);
+    lua_pushnumber(L, (lua_Number) state);
     return 2;
 }
 
diff --git a/src/select.c b/src/select.c
index b870545..51fb198 100644
--- a/src/select.c
+++ b/src/select.c
@@ -122,7 +122,7 @@ static void collect_fd(lua_State *L, int tab, int itab,
     if (lua_isnil(L, tab)) return;
     /* otherwise we need it to be a table */
     luaL_checktype(L, tab, LUA_TTABLE);
-    while (1) {
+    for ( ;; ) {
         t_socket fd;
         lua_pushnumber(L, i);
         lua_gettable(L, tab);
@@ -147,7 +147,7 @@ static void collect_fd(lua_State *L, int tab, int itab,
             if (*max_fd == SOCKET_INVALID || *max_fd < fd) 
                 *max_fd = fd;
             /* make sure we can map back from descriptor to the object */
-            lua_pushnumber(L, fd);
+            lua_pushnumber(L, (lua_Number) fd);
             lua_pushvalue(L, -2);
             lua_settable(L, itab);
         }
@@ -160,7 +160,7 @@ static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set) {
     int ndirty = 0, i = 1;
     if (lua_isnil(L, tab)) 
         return 0;
-    while (1) { 
+    for ( ;; ) { 
         t_socket fd;
         lua_pushnumber(L, i);
         lua_gettable(L, tab);
@@ -187,7 +187,7 @@ static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
     for (fd = 0; fd < max_fd; fd++) {
         if (FD_ISSET(fd, set)) {
             lua_pushnumber(L, ++start);
-            lua_pushnumber(L, fd);
+            lua_pushnumber(L, (lua_Number) fd);
             lua_gettable(L, itab);
             lua_settable(L, tab);
         }
@@ -197,7 +197,7 @@ static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
 static void make_assoc(lua_State *L, int tab) {
     int i = 1, atab;
     lua_newtable(L); atab = lua_gettop(L);
-    while (1) {
+    for ( ;; ) {
         lua_pushnumber(L, i);
         lua_gettable(L, tab);
         if (!lua_isnil(L, -1)) {
diff --git a/src/tcp.c b/src/tcp.c
index ea97320..6734dc0 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -418,7 +418,7 @@ static const char *tryconnect6(const char *remoteaddr, const char *remoteserv,
         /* finally try connecting to remote address */
         err = socket_strerror(socket_connect(&tcp->sock,
             (SA *) iterator->ai_addr,
-            iterator->ai_addrlen, tm));
+            (socklen_t) iterator->ai_addrlen, tm));
         /* if success, break out of loop */
         if (err == NULL) break;
     }
diff --git a/src/udp.c b/src/udp.c
index 4cd9a41..8e14fac 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -139,7 +139,7 @@ static int meth_send(lua_State *L) {
         lua_pushstring(L, udp_strerror(err));
         return 2;
     }
-    lua_pushnumber(L, sent);
+    lua_pushnumber(L, (lua_Number) sent);
     return 1;
 }
 
@@ -189,7 +189,7 @@ static int meth_sendto(lua_State *L) {
         lua_pushstring(L, udp_strerror(err));
         return 2;
     }
-    lua_pushnumber(L, sent);
+    lua_pushnumber(L, (lua_Number) sent);
     return 1;
 }
 
diff --git a/src/wsocket.c b/src/wsocket.c
index 5b184cf..d6dd004 100644
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -181,8 +181,6 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len,
         /* call select to avoid busy wait */
         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
     } 
-    /* can't reach here */
-    return IO_UNKNOWN; 
 }
 
 /*-------------------------------------------------------------------------*\
@@ -214,8 +212,6 @@ int socket_send(p_socket ps, const char *data, size_t count,
         /* avoid busy wait */
         if ((err = socket_waitfd(ps, WAITFD_W, tm)) != IO_DONE) return err;
     } 
-    /* can't reach here */
-    return IO_UNKNOWN;
 }
 
 /*-------------------------------------------------------------------------*\
@@ -237,7 +233,6 @@ int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
         if (err != WSAEWOULDBLOCK) return err;
         if ((err = socket_waitfd(ps, WAITFD_W, tm)) != IO_DONE) return err;
     } 
-    return IO_UNKNOWN;
 }
 
 /*-------------------------------------------------------------------------*\
@@ -258,7 +253,6 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
         if (err != WSAEWOULDBLOCK) return err;
         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
     }
-    return IO_UNKNOWN;
 }
 
 /*-------------------------------------------------------------------------*\
@@ -280,7 +274,6 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
         if (err != WSAEWOULDBLOCK) return err;
         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
     }
-    return IO_UNKNOWN;
 }
 
 /*-------------------------------------------------------------------------*\