diff --git a/libretroshare/src/turtle/rsturtleitem.cc b/libretroshare/src/turtle/rsturtleitem.cc index fd13ab4e2..739793e3e 100644 --- a/libretroshare/src/turtle/rsturtleitem.cc +++ b/libretroshare/src/turtle/rsturtleitem.cc @@ -1132,7 +1132,7 @@ std::ostream& RsTurtleStringSearchRequestItem::print(std::ostream& o, uint16_t) o << "Search request (string):" << std::endl ; o << " direct origin: \"" << PeerId() << "\"" << std::endl ; o << " match string: \"" << match_string << "\"" << std::endl ; - o << " Req. Id: " << (void *)request_id << std::endl ; + o << " Req. Id: " << std::hex << request_id << std::dec << std::endl ; o << " Depth : " << depth << std::endl ; return o ; @@ -1141,7 +1141,7 @@ std::ostream& RsTurtleRegExpSearchRequestItem::print(std::ostream& o, uint16_t) { o << "Search request (regexp):" << std::endl ; o << " direct origin: \"" << PeerId() << "\"" << std::endl ; - o << " Req. Id: " << (void *)request_id << std::endl ; + o << " Req. Id: " << std::hex << request_id << std::dec << std::endl ; o << " Depth : " << depth << std::endl ; o << " RegExp: " << std::endl ; o << " Toks: " ; for(unsigned int i=0;i::const_iterator it(result.begin());it!=result.end();++it) @@ -1171,8 +1171,8 @@ std::ostream& RsTurtleOpenTunnelItem::print(std::ostream& o, uint16_t) o << "Open Tunnel:" << std::endl ; o << " Peer id : " << PeerId() << std::endl ; - o << " Partial tId: " << (void *)partial_tunnel_id << std::endl ; - o << " Req. Id : " << (void *)request_id << std::endl ; + o << " Partial tId: " << std::hex << partial_tunnel_id << std::dec << std::endl ; + o << " Req. Id : " << std::hex << request_id << std::dec << std::endl ; o << " Depth : " << depth << std::endl ; o << " Hash : " << file_hash << std::endl ; @@ -1184,8 +1184,8 @@ std::ostream& RsTurtleTunnelOkItem::print(std::ostream& o, uint16_t) o << "Tunnel Ok:" << std::endl ; o << " Peer id : " << PeerId() << std::endl ; - o << " tunnel id : " << (void*)tunnel_id << std::endl ; - o << " Req. Id : " << (void *)request_id << std::endl ; + o << " tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ; + o << " Req. Id : " << std::hex << request_id << std::dec << std::endl ; return o ; } @@ -1194,7 +1194,7 @@ std::ostream& RsTurtleFileRequestItem::print(std::ostream& o, uint16_t) { o << "File request item:" << std::endl ; - o << " tunnel id : " << (void*)tunnel_id << std::endl ; + o << " tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ; o << " offset : " << chunk_offset << std::endl ; o << " chunk size: " << chunk_size << std::endl ; @@ -1205,10 +1205,10 @@ std::ostream& RsTurtleFileDataItem::print(std::ostream& o, uint16_t) { o << "File request item:" << std::endl ; - o << " tunnel id : " << (void*)tunnel_id << std::endl ; + o << " tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ; o << " offset : " << chunk_offset << std::endl ; o << " chunk size: " << chunk_size << std::endl ; - o << " data : " << (void*)chunk_data << std::endl ; + o << " data : " << std::hex << chunk_data << std::dec << std::endl ; return o ; } @@ -1217,12 +1217,12 @@ std::ostream& RsTurtleFileMapItem::print(std::ostream& o, uint16_t) { o << "File map item:" << std::endl ; - o << " tunnel id : " << (void*)tunnel_id << std::endl ; + o << " tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ; o << " direction : " << direction << std::endl ; o << " map : " ; for(uint32_t i=0;i