Skip to content

Commit cbba2f7

Browse files
socodingsocoding
committed
优化编译警告
1 parent 761fa9c commit cbba2f7

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎src/context_lua.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ void context_lua_t::lua_pushmessage(lua_State *L, message_t& message)
604604
array = message_array(message);
605605
if (array != NULL && array->m_count > 0) {
606606
lua_checkstack(L, array->m_count);
607-
for (int32_t i = 0; i < array->m_count; ++i) { //extract them
607+
for (uint32_t i = 0; i < array->m_count; ++i) { //extract them
608608
lua_pushmessage(L, array->m_array[i]);
609609
}
610610
} else {
@@ -929,7 +929,6 @@ int32_t context_lua_t::context_destroy(lua_State *L)
929929
int32_t context_lua_t::context_check_message(lua_State *L, int32_t idx, uint32_t msg_type, message_t& message)
930930
{
931931
buffer_t* buffer;
932-
bson_t* bson_ptr;
933932
int32_t* bson_data;
934933
const char* data;
935934
size_t length;
@@ -1001,7 +1000,7 @@ int32_t context_lua_t::context_check_message(lua_State *L, int32_t idx, uint32_t
10011000
message.m_type = MAKE_MESSAGE_TYPE(msg_type, ARRAY);
10021001
message.m_data.m_array = array;
10031002
message.m_source = lua_get_context_handle(L);
1004-
for (int32_t i = 0; i < count; ++i) {
1003+
for (uint32_t i = 0; i < count; ++i) {
10051004
if (context_check_message(L, idx + i, msg_type, array->m_array[i]) == 0) {
10061005
return 0;
10071006
}

‎src/lbuffer.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ static int32_t lbuffer_find(lua_State* L)
9191
if (buffer_is_valid(*buffer)) {
9292
int32_t top = lua_gettop(L);
9393
if (top >= 2) {
94-
const char* find = strstr(buffer_data_ptr(*buffer), luaL_checklstring(L, 2, NULL));
94+
const char* ptr = buffer_data_ptr(*buffer);
95+
const char* find = strstr(ptr, luaL_checklstring(L, 2, NULL));
9596
if (find) {
96-
lua_pushinteger(L, (int32_t)(find - buffer_data_ptr(*buffer)) + 1);
97+
lua_pushinteger(L, (int32_t)(find - ptr) + 1);
9798
return 1;
9899
}
99100
return 0;

‎src/lua_udp_handle.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ int32_t lua_udp_handle_t::read(lua_State* L)
268268
request.m_length = REQUEST_SIZE(request_udp_read_t, 0);
269269
request.m_udp_read.m_socket_handle = (uv_udp_handle_t*)socket->m_uv_handle;
270270
singleton_ref(network_t).send_request(request);
271+
return 0;
271272
}
272273

273274
int32_t lua_udp_handle_t::read_callback_adjust(lua_State* L)

‎src/message.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ message_array_t* message_array_create(uint32_t count) {
88

99
void message_array_release(message_array_t* array) {
1010
if (array != NULL) {
11-
for (int32_t i = 0; i < array->m_count; ++i) {
11+
for (uint32_t i = 0; i < array->m_count; ++i) {
1212
message_clean(array->m_array[i]);
1313
}
1414
nl_free(array);

‎src/ref_sessions_mgr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void ref_sessions_mgr_t::put_cached_sessions(ref_sessions_t* ref_sessions)
153153

154154
void ref_sessions_mgr_t::clear_cached_sessions()
155155
{
156-
for (int32_t i = 0; i < m_cached_sessions.size(); ++i) {
156+
for (size_t i = 0; i < m_cached_sessions.size(); ++i) {
157157
delete (m_cached_sessions[i]);
158158
}
159159
m_cached_sessions.clear();

‎src/uv_udp_handle.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void uv_udp_handle_t::on_write(uv_udp_send_t* req, int status)
7979
} else {
8080
buffer_release(uv_request->m_buffer);
8181
}
82-
if (uv_request->m_session != LUA_REFNIL) {
82+
if (uv_request->m_session != (uint32_t)LUA_REFNIL) {
8383
singleton_ref(node_lua_t).context_send(uv_request->m_source, 0, uv_request->m_session, RESPONSE_UDP_WRITE, status == 0 ? UV_OK : singleton_ref(network_t).last_error());
8484
}
8585
socket_handle->put_write_cached_request(uv_request);
@@ -91,7 +91,6 @@ void uv_udp_handle_t::write(request_udp_write_t& request)
9191
if (request.m_shared_write) {
9292
uv_udp_handle_t* handle = (uv_udp_handle_t*)singleton_ref(network_t).get_shared_write_socket(request.m_socket_fd);
9393
if (handle != NULL) {
94-
uint32_t length = request.m_length > 0 ? request.m_length : (uint32_t)buffer_data_length(request.m_buffer);
9594
if (uv_is_closing((uv_handle_t*)handle)) {
9695
err = NL_EUDPSCLOSED;
9796
} else {
@@ -109,7 +108,7 @@ void uv_udp_handle_t::write(request_udp_write_t& request)
109108
} else {
110109
buffer_release(request.m_buffer);
111110
}
112-
if (request.m_session != LUA_REFNIL) {
111+
if (request.m_session != (uint32_t)LUA_REFNIL) {
113112
singleton_ref(node_lua_t).context_send(request.m_source, 0, request.m_session, RESPONSE_UDP_WRITE, (nl_err_code)err);
114113
}
115114
}

‎src/uv_udp_handle.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class uv_udp_handle_t : public uv_handle_base_t
7272
m_write_cached_reqs.push_back(request);
7373
}
7474
void clear_write_cached_requests() {
75-
for (int i = 0; i < m_write_cached_reqs.size(); ++i) {
75+
for (size_t i = 0; i < m_write_cached_reqs.size(); ++i) {
7676
nl_free(m_write_cached_reqs[i]);
7777
}
7878
m_write_cached_reqs.clear();

0 commit comments

Comments
 (0)