From 7c2f33bdf37de7acf9b0728a115377081344db1c Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 11 Nov 2018 20:18:26 +0800
Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lua/modules/net/je_lua_socket.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/lua/modules/net/je_lua_socket.cpp')

diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
index 0b59199..4072921 100644
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ b/src/lua/modules/net/je_lua_socket.cpp
@@ -12,11 +12,11 @@ namespace JinEngine
     namespace Lua
     {
 
-	    typedef Shared<Socket>& SocketRef;
+	    typedef Shared<Socket>& SharedSocket;
 
         const int BUFFER_SIZE = 1024;
 
-        LUA_IMPLEMENT inline SocketRef checkSocket(lua_State* L, int pos = 1)
+        LUA_IMPLEMENT inline SharedSocket checkSocket(lua_State* L, int pos = 1)
         {
             Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET);
 		    return proxy->getShared<Socket>();
@@ -31,9 +31,9 @@ namespace JinEngine
         // return net.Socket
         LUA_IMPLEMENT int l_accept(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             Socket* client = socket->accept();
-            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+            Proxy* proxy = luax_newinstance(L, JIN_NETWORK_SOCKET);
             proxy->bind(new Shared<Socket>(client, JIN_NETWORK_SOCKET));
             return 1;
         }
@@ -41,10 +41,10 @@ namespace JinEngine
         // return net.Buffer
         LUA_IMPLEMENT int l_receive(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             char buffer[BUFFER_SIZE] = {0};
             int size = socket->receive(buffer, BUFFER_SIZE);
-            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+            Proxy* proxy = luax_newinstance(L, JIN_NETWORK_BUFFER);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
             proxy->bind(new Shared<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
             return 1;
@@ -53,13 +53,13 @@ namespace JinEngine
         // Socket:receiveFrom(address, port)
         LUA_IMPLEMENT int l_receiveFrom(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             int address = luax_checkinteger(L, 2);
             int port = luax_checkinteger(L, 3);
             char buffer[BUFFER_SIZE];
             int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+            Proxy* proxy = luax_newinstance(L, JIN_NETWORK_BUFFER);
             proxy->bind(new Shared<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
             return 1;
         }
@@ -67,9 +67,9 @@ namespace JinEngine
         // Socket:send(net.Buffer) -> data_length
         LUA_IMPLEMENT int l_send(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
-		    Shared<Buffer>& ref = checkNetBuffer(L, 2);
-            int len = socket->send(ref->buffer, ref->size);
+		    SharedSocket socket = checkSocket(L);
+		    Shared<Buffer>& shared = checkNetBuffer(L, 2);
+            int len = socket->send(shared->buffer, shared->size);
             luax_pushinteger(L, len);
             return 1;
         }
@@ -77,7 +77,7 @@ namespace JinEngine
         // Socket:sendTo(address, port, net.Buffer)
         LUA_IMPLEMENT int l_sendTo(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             int address = luax_checkinteger(L, 2);
             int port = luax_checkinteger(L, 3);
 		    Shared<Buffer>& buffer = checkNetBuffer(L, 4);
@@ -87,14 +87,14 @@ namespace JinEngine
     
         LUA_IMPLEMENT int l_close(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             socket->close();
             return 0;
         }
 
         LUA_IMPLEMENT int l_configBlocking(lua_State* L) 
         {
-		    SocketRef socket = checkSocket(L);
+		    SharedSocket socket = checkSocket(L);
             bool blocking = luax_checkbool(L, 2);
             socket->configureBlocking(blocking);
             return 0;
-- 
cgit v1.1-26-g67d0