Skip to content

Commit

Permalink
Fix warning for comparing int with sizeof.
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Aug 10, 2022
1 parent 26284e3 commit 0227e44
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_latest_version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ srs_error_t SrsLatestVersion::start()

for (int i = 0; i < 16; i++) {
int r0 = snprintf(buf + i * 2, sizeof(buf) - i * 2, "%02x", uuid[i]);
srs_assert(r0 > 0 && r0 < sizeof(buf) - i * 2);
srs_assert(r0 > 0 && r0 < (int)sizeof(buf) - i * 2);
}
server_id_ = buf;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_listener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ std::string SrsUdpMuxSocket::peer_id()
// Build the peer id, reserve 1 byte for the trailing '\0'.
static char id_buf[128 + 1];
int len = snprintf(id_buf, sizeof(id_buf), "%s:%d", peer_ip.c_str(), peer_port);
if (len <= 0 || len >= sizeof(id_buf)) {
if (len <= 0 || len >= (int)sizeof(id_buf)) {
return "";
}
peer_id_ = string(id_buf, len);
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/protocol/srs_protocol_srt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ srs_error_t srs_srt_listen(srs_srt_t srt_fd, std::string ip, int port)

char sport[8];
int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
srs_assert(r0 > 0 && r0 < (int)sizeof(sport));

addrinfo hints;
memset(&hints, 0, sizeof(hints));
Expand Down
6 changes: 3 additions & 3 deletions trunk/src/protocol/srs_protocol_st.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ srs_error_t srs_tcp_connect(string server, int port, srs_utime_t tm, srs_netfd_t

char sport[8];
int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
srs_assert(r0 > 0 && r0 < (int)sizeof(sport));

addrinfo hints;
memset(&hints, 0, sizeof(hints));
Expand Down Expand Up @@ -253,7 +253,7 @@ srs_error_t srs_tcp_listen(std::string ip, int port, srs_netfd_t* pfd)

char sport[8];
int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
srs_assert(r0 > 0 && r0 < (int)sizeof(sport));

addrinfo hints;
memset(&hints, 0, sizeof(hints));
Expand Down Expand Up @@ -315,7 +315,7 @@ srs_error_t srs_udp_listen(std::string ip, int port, srs_netfd_t* pfd)

char sport[8];
int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
srs_assert(r0 > 0 && r0 < (int)sizeof(sport));

addrinfo hints;
memset(&hints, 0, sizeof(hints));
Expand Down

0 comments on commit 0227e44

Please sign in to comment.