2 files changed, 19 insertions, 24 deletions

diff --git a/src/lua/net/luaopen_Buffer.cpp b/src/lua/net/luaopen_Buffer.cpp
index e7100cc..f50f82e 100644
--- a/src/lua/net/luaopen_Buffer.cpp
+++ b/src/lua/net/luaopen_Buffer.cpp
@@ -25,7 +25,7 @@ namespace net
         {
             int n = luax_checkinteger(L, vp);
             int size = sizeof(n);
-            (*ref).append(&n, size);
+            ref->append(&n, size);
             luax_pushinteger(L, size);
             return 1;
         } 
@@ -33,7 +33,7 @@ namespace net
         {
             float n = luax_checknumber(L, vp);
             int size = sizeof(n);
-			(*ref).append(&n, size);
+			ref->append(&n, size);
             luax_pushinteger(L, size);
             return 1;
         }
@@ -41,7 +41,7 @@ namespace net
         {
             bool n = luax_checkbool(L, vp);
             int size = sizeof(n);
-			(*ref).append(&n, size);
+			ref->append(&n, size);
             luax_pushinteger(L, size);
             return 1;
         }
@@ -49,7 +49,7 @@ namespace net
         {
             const char* str = luax_checkstring(L, vp);
             int size = strlen(str) + 1;
-			(*ref).append(str, size);
+			ref->append(str, size);
             luax_pushinteger(L, size);
             return 1;
         }
@@ -66,7 +66,7 @@ namespace net
 		Ref<Buffer>& ref = checkNetBuffer(L);
         int offset = luax_checkinteger(L, 2);
         int len;
-        const char* str = (*ref).grabString(&len, offset);
+        const char* str = ref->grabString(&len, offset);
         luax_pushstring(L, str);
         luax_pushinteger(L, len);
         return 2;
@@ -78,7 +78,7 @@ namespace net
 		Ref<Buffer>& ref = checkNetBuffer(L);
         int offset = luax_checkinteger(L, 2);
         int len;
-        int integer = (*ref).grabInteger(&len, offset);
+        int integer = ref->grabInteger(&len, offset);
         luax_pushinteger(L, integer);
         luax_pushinteger(L, len);
         return 2;
@@ -89,7 +89,7 @@ namespace net
 		Ref<Buffer>& ref = checkNetBuffer(L);
         int offset = luax_checkinteger(L, 2);
         int len;
-        float floatv = (*ref).grabFloat(&len, offset);
+        float floatv = ref->grabFloat(&len, offset);
         luax_pushnumber(L, floatv);
         luax_pushinteger(L, len);
         return 2;
@@ -100,7 +100,7 @@ namespace net
 		Ref<Buffer>& ref = checkNetBuffer(L);
         int offset = luax_checkinteger(L, 2);
         int len;
-        bool boolean = (*ref).grabBoolean(&len, offset);
+        bool boolean = ref->grabBoolean(&len, offset);
         luax_pushboolean(L, boolean);
         luax_pushinteger(L, len);
         return 2;
diff --git a/src/lua/net/luaopen_Socket.cpp b/src/lua/net/luaopen_Socket.cpp
index 40a62b6..4f8c45a 100644
--- a/src/lua/net/luaopen_Socket.cpp
+++ b/src/lua/net/luaopen_Socket.cpp
@@ -29,10 +29,9 @@ namespace lua
     static int l_accept(lua_State* L) 
     {
 		Ref<Socket>& socket = checkSocket(L);
-		Socket* client = (*socket).accept();
-		Ref<Socket>* ref = new Ref<Socket>(client);
+        Socket* client = socket->accept();
         Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
-        proxy->bind(ref, JIN_NETWORK_SOCKET);
+        proxy->bind(new Ref<Socket>(client), JIN_NETWORK_SOCKET);
         return 1;
     }
     
@@ -41,11 +40,10 @@ namespace lua
     {
 		Ref<Socket>& socket = checkSocket(L);
         char buffer[BUFFER_SIZE] = {0};
-        int size = (*socket).receive(buffer, BUFFER_SIZE);
+        int size = socket->receive(buffer, BUFFER_SIZE);
         Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
         net::Buffer* netBuffer = new net::Buffer(buffer, size);
-		Ref<Buffer>* ref = new Ref<Buffer>(netBuffer);
-        proxy->bind(ref, JIN_NETWORK_BUFFER);
+        proxy->bind(new Ref<Buffer>(netBuffer), JIN_NETWORK_BUFFER);
         return 1;
     }
     
@@ -56,11 +54,10 @@ namespace lua
         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);
+        int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
         net::Buffer* netBuffer = new net::Buffer(buffer, size);
-		Ref<Buffer>* ref = new Ref<Buffer>(netBuffer);
         Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
-        proxy->bind(ref, JIN_NETWORK_BUFFER);
+        proxy->bind(new Ref<Buffer>(netBuffer), JIN_NETWORK_BUFFER);
         return 1;
     }
 
@@ -69,8 +66,7 @@ namespace lua
     {
 		Ref<Socket>& socket = checkSocket(L);
 		Ref<Buffer>& ref = checkNetBuffer(L, 2);
-		net::Buffer* buffer = &*ref;
-        int len = (*socket).send(buffer->buffer, buffer->size);
+        int len = socket->send(ref->buffer, ref->size);
         luax_pushinteger(L, len);
         return 1;
     }
@@ -81,16 +77,15 @@ namespace lua
 		Ref<Socket>& socket = checkSocket(L);
         int address = luax_checkinteger(L, 2);
         int port = luax_checkinteger(L, 3);
-		Ref<Buffer>& ref = checkNetBuffer(L, 4);
-        net::Buffer* buffer = &*ref;
-        (*socket).sendTo(buffer->buffer, buffer->size, address, port);
+		Ref<Buffer>& buffer = checkNetBuffer(L, 4);
+        socket->sendTo(buffer->buffer, buffer->size, address, port);
         return 0;
     }
     
     static int l_close(lua_State* L) 
     {
 		Ref<Socket>& socket = checkSocket(L);
-        (*socket).close();
+        socket->close();
         return 0;
     }
 
@@ -98,7 +93,7 @@ namespace lua
     {
 		Ref<Socket>& socket = checkSocket(L);
         bool blocking = luax_checkbool(L, 2);
-        (*socket).configureBlocking(blocking);
+        socket->configureBlocking(blocking);
         return 0;
     }