[rocketmq-client-cpp] branch master updated: avoid possible type conversion compile error (#419)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 5099062  avoid possible type conversion compile error (#419)
5099062 is described below

commit 509906235aa1c43348c827a0898cc722836c4f0e
Author: xiaojin <zt...@163.com>
AuthorDate: Tue Jun 28 10:48:45 2022 +0800

    avoid possible type conversion compile error (#419)
    
    * avoid possible type conversion compile error
    
    (cherry picked from commit 5be97e7c7a82afa87a84e959ce326ee33a98beef)
    
    * Update src/transport/TcpTransport.cpp
    
    Co-authored-by: James Yin <yw...@hotmail.com>
    
    Co-authored-by: James Yin <yw...@hotmail.com>
---
 src/producer/StringIdMaker.cpp | 10 +++++-----
 src/transport/TcpTransport.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/producer/StringIdMaker.cpp b/src/producer/StringIdMaker.cpp
index 13978e3..ecd3653 100644
--- a/src/producer/StringIdMaker.cpp
+++ b/src/producer/StringIdMaker.cpp
@@ -125,11 +125,11 @@ std::string StringIdMaker::createUniqID() {
   return std::string(kFixString, 20) + std::string(hex_buf, 12);
 }
 
-void StringIdMaker::hexdump(unsigned char* in, char* out, std::size_t len) {
-  for (std::size_t i = 0; i < len; i++) {
-    unsigned char v = in[i];
-    out[i * 2] = sHexAlphabet[v >> 4];
-    out[i * 2 + 1] = sHexAlphabet[v & 0x0FU];
+void StringIdMaker::hexdump(unsigned char* buffer, char* out_buff, std::size_t index) {
+  for (std::size_t i = 0; i < index; i++) {
+    unsigned char v = buffer[i];
+    out_buff[i * 2] = sHexAlphabet[v >> 4];
+    out_buff[i * 2 + 1] = sHexAlphabet[v & 0x0FU];
   }
 }
 
diff --git a/src/transport/TcpTransport.cpp b/src/transport/TcpTransport.cpp
index 2942258..d8c23f9 100644
--- a/src/transport/TcpTransport.cpp
+++ b/src/transport/TcpTransport.cpp
@@ -207,7 +207,7 @@ void TcpTransport::eventCallback(BufferEvent* event, short what, TcpTransport* t
 
     // disable Nagle
     int val = 1;
-    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void*)&val, sizeof(val));
+    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, static_cast<const char *>(&val), sizeof(val));
     transport->setTcpConnectEvent(TCP_CONNECT_STATUS_SUCCESS);
   } else if (what & (BEV_EVENT_ERROR | BEV_EVENT_EOF | BEV_EVENT_READING | BEV_EVENT_WRITING)) {
     LOG_INFO("eventcb: received error event cb:%x on fd:%d", what, fd);