Skip to content
Snippets Groups Projects
Commit 9e6c89ef authored by Carsten Patzke's avatar Carsten Patzke
Browse files

[RequestPool] Fixed memcheck

parent 3b9b60ea
No related branches found
No related tags found
No related merge requests found
......@@ -47,13 +47,6 @@ const std::size_t kPosDataSetId = 1;
const std::size_t kPosDataSetSize = 2;
struct GenericRequestHeader {
GenericRequestHeader(Opcode i_op_code = kOpcodeUnknownOp, uint64_t i_data_id = 0,
uint64_t i_data_size = 0, uint64_t i_meta_size = 0, const std::string& i_message = "",
const std::string& i_substream = ""):
op_code{i_op_code}, data_id{i_data_id}, data_size{i_data_size}, meta_size{i_meta_size} {
memcpy(message, i_message.c_str(), kMaxMessageSize);
strncpy(substream, i_substream.c_str(), kMaxMessageSize);
}
GenericRequestHeader(const GenericRequestHeader& header) {
op_code = header.op_code, data_id = header.data_id, data_size = header.data_size, meta_size = header.meta_size,
memcpy(custom_data, header.custom_data, kNCustomParams * sizeof(uint64_t)),
......@@ -61,6 +54,15 @@ struct GenericRequestHeader {
strncpy(substream, header.substream, kMaxMessageSize);
}
/* THIS CONSTRUCTOR SHOULD ONLY BE CALLED FOR TESTS! (because the message is only being strncpy'ed */
GenericRequestHeader(Opcode i_op_code = kOpcodeUnknownOp, uint64_t i_data_id = 0,
uint64_t i_data_size = 0, uint64_t i_meta_size = 0, const std::string& i_message = "",
const std::string& i_substream = ""):
op_code{i_op_code}, data_id{i_data_id}, data_size{i_data_size}, meta_size{i_meta_size} {
strncpy(message, i_message.c_str(), kMaxMessageSize);
strncpy(substream, i_substream.c_str(), kMaxMessageSize);
}
Opcode op_code;
uint64_t data_id;
uint64_t data_size;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment