diff options
| author | ruki <[email protected]> | 2022-04-06 22:51:24 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-04-06 22:51:24 +0800 |
| commit | 313fc50dbd586e43c7516dc12202db02e6b94945 (patch) | |
| tree | 446a2ce9bab6d148974b5fa2624c57722b9936ed /core/src | |
| parent | 3d378500c304db2776ff2969491084ce4d320e58 (diff) | |
improve pipe write
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/xmake/io/pipe_write.c | 46 | ||||
| -rw-r--r-- | core/src/xmake/io/socket_sendto.c | 30 |
2 files changed, 10 insertions, 66 deletions
diff --git a/core/src/xmake/io/pipe_write.c b/core/src/xmake/io/pipe_write.c index c44836783..0c8c2bd12 100644 --- a/core/src/xmake/io/pipe_write.c +++ b/core/src/xmake/io/pipe_write.c @@ -52,29 +52,11 @@ tb_int_t xm_io_pipe_write(lua_State* lua) tb_pipe_file_ref_t pipefile = (tb_pipe_file_ref_t)xm_lua_topointer(lua, 1); tb_check_return_val(pipefile, 0); - // get data + // get data and size tb_size_t size = 0; tb_byte_t const* data = tb_null; - if (lua_istable(lua, 2)) - { - // get data address - lua_pushstring(lua, "data"); - lua_gettable(lua, 2); - data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, -1); - lua_pop(lua, 1); - - // get data size - lua_pushstring(lua, "size"); - lua_gettable(lua, 2); - size = (tb_size_t)lua_tonumber(lua, -1); - lua_pop(lua, 1); - } - else - { - size_t datasize = 0; - data = (tb_byte_t const*)luaL_checklstring(lua, 2, &datasize); - size = (tb_size_t)datasize; - } + if (lua_isnumber(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, 2); + if (lua_isnumber(lua, 3)) size = (tb_size_t)lua_tonumber(lua, 3); if (!data || !size) { lua_pushinteger(lua, -1); @@ -82,28 +64,8 @@ tb_int_t xm_io_pipe_write(lua_State* lua) return 2; } - // get start - tb_long_t start = 1; - if (lua_isnumber(lua, 3)) start = (tb_long_t)lua_tonumber(lua, 3); - if (start < 1 || start > size) - { - lua_pushinteger(lua, -1); - lua_pushfstring(lua, "invalid start position(%d)!", (tb_int_t)start); - return 2; - } - - // get last - tb_long_t last = (tb_long_t)size; - if (lua_isnumber(lua, 4)) last = (tb_long_t)lua_tonumber(lua, 4); - if (last < start - 1 || last > size + start - 1) - { - lua_pushinteger(lua, -1); - lua_pushfstring(lua, "invalid last position(%d)!", (tb_int_t)last); - return 2; - } - // write data - tb_long_t real = tb_pipe_file_write(pipefile, data + start - 1, last - start + 1); + tb_long_t real = tb_pipe_file_write(pipefile, data, size); lua_pushinteger(lua, (tb_int_t)real); return 1; } diff --git a/core/src/xmake/io/socket_sendto.c b/core/src/xmake/io/socket_sendto.c index f203df5b6..de3b39b75 100644 --- a/core/src/xmake/io/socket_sendto.c +++ b/core/src/xmake/io/socket_sendto.c @@ -52,29 +52,11 @@ tb_int_t xm_io_socket_sendto(lua_State* lua) tb_socket_ref_t sock = (tb_socket_ref_t)xm_lua_topointer(lua, 1); tb_check_return_val(sock, 0); - // get data + // get data and size tb_size_t size = 0; tb_byte_t const* data = tb_null; - if (lua_istable(lua, 2)) - { - // get data address - lua_pushstring(lua, "data"); - lua_gettable(lua, 2); - data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, -1); - lua_pop(lua, 1); - - // get data size - lua_pushstring(lua, "size"); - lua_gettable(lua, 2); - size = (tb_size_t)lua_tonumber(lua, -1); - lua_pop(lua, 1); - } - else - { - size_t datasize = 0; - data = (tb_byte_t const*)luaL_checklstring(lua, 2, &datasize); - size = (tb_size_t)datasize; - } + if (lua_isnumber(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, 2); + if (lua_isnumber(lua, 3)) size = (tb_size_t)lua_tonumber(lua, 3); if (!data || !size) { lua_pushinteger(lua, -1); @@ -83,8 +65,8 @@ tb_int_t xm_io_socket_sendto(lua_State* lua) } // get address - tb_char_t const* addr = lua_tostring(lua, 3); - tb_uint16_t port = (tb_uint16_t)luaL_checknumber(lua, 4); + tb_char_t const* addr = lua_tostring(lua, 4); + tb_uint16_t port = (tb_uint16_t)luaL_checknumber(lua, 5); if (!addr || !port) { lua_pushinteger(lua, -1); @@ -93,7 +75,7 @@ tb_int_t xm_io_socket_sendto(lua_State* lua) } // get address family - tb_size_t family = (tb_size_t)luaL_checknumber(lua, 5); + tb_size_t family = (tb_size_t)luaL_checknumber(lua, 6); // init ip address tb_ipaddr_t ipaddr; |
