From: Petteri Aimonen Date: Thu, 5 Jul 2012 15:27:07 +0000 (+0300) Subject: Apparently some compilers don't want to automatically cast size_t to uint64_t. X-Git-Tag: 5.0.2~186^2~482 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=01a155689828574047a8377d595a0ad038c48917;p=apps%2Fagl-service-can-low-level.git Apparently some compilers don't want to automatically cast size_t to uint64_t. --- diff --git a/pb_encode.c b/pb_encode.c index faaeac9d..be909ec2 100644 --- a/pb_encode.c +++ b/pb_encode.c @@ -110,7 +110,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie size = sizestream.bytes_written; } - if (!pb_encode_varint(stream, size)) + if (!pb_encode_varint(stream, (uint64_t)size)) return false; if (stream->callback == NULL) @@ -269,7 +269,7 @@ bool checkreturn pb_encode_fixed64(pb_ostream_t *stream, const void *value) bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number) { int tag = wiretype | (field_number << 3); - return pb_encode_varint(stream, tag); + return pb_encode_varint(stream, (uint64_t)tag); } bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field) @@ -305,7 +305,7 @@ bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t bool checkreturn pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size) { - if (!pb_encode_varint(stream, size)) + if (!pb_encode_varint(stream, (uint64_t)size)) return false; return pb_write(stream, buffer, size); @@ -323,7 +323,7 @@ bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie size = substream.bytes_written; - if (!pb_encode_varint(stream, size)) + if (!pb_encode_varint(stream, (uint64_t)size)) return false; if (stream->callback == NULL)