cyonjan/WeChatFerry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix encode_dbnames

Browse Source
This commit is contained in:
Changhua 2023-04-30 18:11:02 +08:00
parent 39423028a7
commit 444dcaf352
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpc/pb_util.cpp
View File

@ -109,19 +109,14 @@ bool encode_contacts(pb_ostream_t *stream, const pb_field_t *field, void *const
bool encode_dbnames(pb_ostream_t *stream, const pb_field_t *field, void *const *arg) bool encode_dbnames(pb_ostream_t *stream, const pb_field_t *field, void *const *arg)
{ {
vector<string> *v = (vector<string> *)*arg; DbNames_t *v = (DbNames_t *)*arg;
DbNames message = DbNames_init_default;
for (auto it = v->begin(); it != v->end(); it++) { for (auto it = v->begin(); it != v->end(); it++) {
message.names.funcs.encode = &encode_string;
message.names.arg = (void *)(*it).c_str();
if (!pb_encode_tag_for_field(stream, field)) { if (!pb_encode_tag_for_field(stream, field)) {
LOG_ERROR("Encoding failed: {}", PB_GET_ERROR(stream)); LOG_ERROR("Encoding failed: {}", PB_GET_ERROR(stream));
return false; return false;
} }
if (!pb_encode_submessage(stream, DbNames_fields, &message)) { if (!pb_encode_string(stream, (uint8_t *)(*it).c_str(), (*it).size())) {
LOG_ERROR("Encoding failed: {}", PB_GET_ERROR(stream)); LOG_ERROR("Encoding failed: {}", PB_GET_ERROR(stream));
return false; return false;
} }