From e266a4a088a46dd204b55d41ed69a08fb8ca433c Mon Sep 17 00:00:00 2001 From: i7-8700 <1281261856@qq.com> Date: Wed, 5 Aug 2020 02:38:02 +0800 Subject: [PATCH] fix warnings --- examples/bench_client/bench_client.cpp | 3 ++- examples/dll_demo/dll_demo.cpp | 6 ++--- examples/server_demo/server_demo.cpp | 25 ++++++++++--------- .../server_demo_libevent.cpp | 21 +++++++++------- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/examples/bench_client/bench_client.cpp b/examples/bench_client/bench_client.cpp index b8c3e2f..7f8349c 100644 --- a/examples/bench_client/bench_client.cpp +++ b/examples/bench_client/bench_client.cpp @@ -18,6 +18,7 @@ #include <stdio.h> #include <errno.h> #include <stdlib.h> +#include <inttypes.h> #include <string.h> #include <time.h> #include <string> @@ -232,7 +233,7 @@ void eventcb(struct bufferevent* bev, short events, void* user_data) printf("All disconnected\n"); double encodeSpeed = totalEncodeTime * 1.0 / totalMsgWritten; double decodeSpeed = totalDecodeTime * 1.0 / totalMsgRead; - printf("Read %.2f MiB %lld packets, Write %.2f MiB %lld packets\n" + printf("Read %.2f MiB %" PRId64 " packets, Write %.2f MiB %" PRId64 " packets\n" "Average msg size is %.2f bytes\n" "Throughput is %.2f MiB/s %.2f packets/s\n" "Encode average time %.2f us, %.2f packets/s\n" diff --git a/examples/dll_demo/dll_demo.cpp b/examples/dll_demo/dll_demo.cpp index eebfced..a625a2d 100644 --- a/examples/dll_demo/dll_demo.cpp +++ b/examples/dll_demo/dll_demo.cpp @@ -24,21 +24,21 @@ int main() // è§£æžå®Œæ•´æ•°æ®åŒ… { char raw[] = "\nC5C30053\"HENG-BO\"0000R000000L000000#90219125916578[#000000|1737 00 000]_09:11:19,08-05-2019\r"; - int res = parse(raw, strlen(raw), &cb_commited); + int res = parse(raw, (int)strlen(raw), &cb_commited); assert(res == 0); } // è§£æžé•¿åº¦ä¸è¶³çš„æ•°æ®åŒ… { char raw_not_enough[] = "\nC5C30053\"HENG-BO\"0000R000000L000000"; - int res = parse(raw_not_enough, strlen(raw_not_enough), &cb_commited); + int res = parse(raw_not_enough, (int)strlen(raw_not_enough), &cb_commited); assert(res == 1); } // è§£æžåˆ°é”™è¯¯æ•°æ®åŒ… { char raw_error[] = "abcdeadfasdfasdfasd"; - int res = parse(raw_error, strlen(raw_error), &cb_commited); + int res = parse(raw_error, (int)strlen(raw_error), &cb_commited); assert(res == 2); } diff --git a/examples/server_demo/server_demo.cpp b/examples/server_demo/server_demo.cpp index dfdec0d..0c3cfd8 100644 --- a/examples/server_demo/server_demo.cpp +++ b/examples/server_demo/server_demo.cpp @@ -125,7 +125,7 @@ int main(int argc, char** argv) FD_ZERO(&rfd); FD_SET(serverSock, &rfd); timeval timeout = { 1, 0 }; - int nfds = select(serverSock + 1, &rfd, (fd_set*)0, (fd_set*)0, &timeout); + int nfds = select((int)(serverSock + 1), &rfd, (fd_set*)0, (fd_set*)0, &timeout); printf("do_accept, select ret=%d\n", nfds); if (nfds > 0) { FD_CLR(serverSock, &rfd); @@ -134,7 +134,7 @@ int main(int argc, char** argv) if (ret != 0) { exit(0); } - printf("Got connection from %s:%d, fd=%d\n", inet_ntoa(sForeignAddrIn.sin_addr), sForeignAddrIn.sin_port, clientSock); + printf("Got connection from %s:%d, fd=%d\n", inet_ntoa(sForeignAddrIn.sin_addr), sForeignAddrIn.sin_port, (int)clientSock); } }; @@ -160,7 +160,7 @@ int main(int argc, char** argv) char ack[1024]; auto len = ap.make_ack(ack, sizeof(ack), ap.seq_.value_, ap.acct_.acct(), ap.ademcoData_.ademco_id_); printf("S:%s\n", ap.toString().data()); - send(clientSock, ack, len, 0); + send(clientSock, ack, (int)len, 0); break; } @@ -178,7 +178,7 @@ int main(int argc, char** argv) auto len = ap.make_ack(ack, sizeof(ack), ap.seq_.value_, ap.acct_.acct(), ap.ademcoData_.ademco_id_); printf("S:%s\n", ap.toString().data()); // send to machine via network - send(clientSock, ack, len, 0); + send(clientSock, ack, (int)len, 0); } break; @@ -211,7 +211,7 @@ int main(int argc, char** argv) fd_set fd_read; FD_ZERO(&fd_read); FD_SET(clientSock, &fd_read); - int nfds = select(clientSock + 1, &fd_read, (fd_set*)0, (fd_set*)0, &tv); + int nfds = select(int(clientSock + 1), &fd_read, (fd_set*)0, (fd_set*)0, &tv); if (nfds <= 0) { return; } @@ -221,7 +221,7 @@ int main(int argc, char** argv) char* temp = clientBuffer.buff + clientBuffer.wpos; size_t dwLenToRead = BUFF_SIZE - clientBuffer.wpos; - int bytes_transfered = recv(clientSock, temp, dwLenToRead, 0); + int bytes_transfered = recv(clientSock, temp, (int)dwLenToRead, 0); if (-1 == bytes_transfered) { if (EAGAIN == errno) { @@ -230,14 +230,14 @@ int main(int argc, char** argv) } if (bytes_transfered <= 0) { - printf("Client %d offline\n", clientSock); + printf("Client %d offline\n", (int)clientSock); close(clientSock); clientSock = INVALID_SOCKET; clientBuffer.clear(); } else { clientBuffer.wpos += bytes_transfered; auto result = do_handle(); while (1) { - unsigned int bytes_not_commited = clientBuffer.wpos - clientBuffer.rpos; + size_t bytes_not_commited = clientBuffer.wpos - clientBuffer.rpos; if (bytes_not_commited == 0) { if (clientBuffer.wpos == BUFF_SIZE) { clientBuffer.clear(); @@ -276,11 +276,11 @@ int main(int argc, char** argv) auto xdata = makeXData(pwd, 6); auto len = ap.make_hb(buf, sizeof(buf), 1, clientAcct, clientAdemcoId, 0, e, 0, xdata); printf("S:%s\n", ap.toString().data()); - send(clientSock, buf, len, 0); + send(clientSock, buf, (int)len, 0); } else { auto len = ap.make_hb(buf, sizeof(buf), 1, clientAcct, clientAdemcoId, 0, e, 0); printf("S:%s\n", ap.toString().data()); - send(clientSock, buf, len, 0); + send(clientSock, buf, (int)len, 0); } } @@ -298,10 +298,11 @@ int main(int argc, char** argv) std::lock_guard<std::mutex> lg(mutex); evntsWaiting4Send.push_back(EVENT_ARM); } else if (cmd == 'd' || cmd == 'D') { + int ret = 0; do { printf("Input 6 digit password:"); - scanf("%s", pwd); - } while (strlen(pwd) != 6); + ret = scanf("%s", pwd); + } while (ret != 1 || strlen(pwd) != 6); std::lock_guard<std::mutex> lg(mutex); evntsWaiting4Send.push_back(EVENT_DISARM); } else if (cmd == 'e' || cmd == 'E') { diff --git a/examples/server_demo_libevent/server_demo_libevent.cpp b/examples/server_demo_libevent/server_demo_libevent.cpp index 44e782c..0b4d816 100644 --- a/examples/server_demo_libevent/server_demo_libevent.cpp +++ b/examples/server_demo_libevent/server_demo_libevent.cpp @@ -472,17 +472,20 @@ int main(int argc, char** argv) break; case 'D': - do { - printf("Input 6 digit password:"); - scanf("%s", userInput.pwd); - } while (strlen(userInput.pwd) != 6); { - std::lock_guard<std::mutex> lg(mutex); - events.push_back(EVENT_DISARM); - threads_to_handled_event = thread_count; - } - fire_command(); + int ret = 0; + do { + printf("Input 6 digit password:"); + ret = scanf("%s", userInput.pwd); + } while (ret != 1 || strlen(userInput.pwd) != 6); + { + std::lock_guard<std::mutex> lg(mutex); + events.push_back(EVENT_DISARM); + threads_to_handled_event = thread_count; + } + fire_command(); break; + } case 'E': { -- 2.18.1