From: Petteri Aimonen Date: Tue, 11 Oct 2016 05:12:38 +0000 (+0300) Subject: Merge pull request #218 from berni155/master X-Git-Tag: 5.0.2~186^2~55 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=599939a85dce96c78c357341b731ccc173885d5b;hp=fe0aca04cbc41327144813ca54ea37aafb866d25;p=apps%2Fagl-service-can-low-level.git Merge pull request #218 from berni155/master Fix typo in encoding --- diff --git a/pb_encode.c b/pb_encode.c index 4f57fa5f..b0a736a2 100644 --- a/pb_encode.c +++ b/pb_encode.c @@ -214,15 +214,18 @@ static bool checkreturn encode_basic_field(pb_ostream_t *stream, { /* In proto3 there are optional fields but no has_ flag, do not encode this fields * when value is default or empty. */ - if(PB_LTYPE(field->type) == PB_LTYPE_BYTES){ + if(PB_LTYPE(field->type) == PB_LTYPE_BYTES) + { const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)pData; if(bytes->size == 0) implicit_has = false; + } else if ((PB_LTYPE(field->type) == PB_LTYPE_STRING && *(const char*)pData == '\0') || (field->data_size == sizeof(uint_least8_t) && *(const uint_least8_t*)pData == 0) || (field->data_size == sizeof(uint_least16_t) && *(const uint_least16_t*)pData == 0) || (field->data_size == sizeof(uint32_t) && *(const uint_least32_t*)pData == 0) || (field->data_size == sizeof(uint64_t) && *(const uint_least64_t*)pData == 0)) + { implicit_has = false; } pSize = &implicit_has;