rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-constant initializer errors with some compilers.

Browse Source 
Fixes issue #13. Thanks to Kevin Worth for reporting.
This commit is contained in:
Petteri Aimonen
2012-06-13 21:43:40 +03:00
parent 5af2c97ecd
commit 7e1059628c
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pb_decode.c
View File

@@ -476,8 +476,11 @@ bool checkreturn pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, v
uint8_t bytes[4] = {0}; uint8_t bytes[4] = {0};
bool status = pb_read(stream, bytes, 4); bool status = pb_read(stream, bytes, 4);
if (status) { if (status) {
uint8_t bebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]}; uint8_t *d = (uint8_t*)dest;
memcpy(dest, bebytes, 4); d[0] = bytes[3];
d[1] = bytes[2];
d[2] = bytes[1];
d[3] = bytes[0];
} }
return status; return status;
#else #else
@@ -492,9 +495,15 @@ bool checkreturn pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, v
uint8_t bytes[8] = {0}; uint8_t bytes[8] = {0};
bool status = pb_read(stream, bytes, 8); bool status = pb_read(stream, bytes, 8);
if (status) { if (status) {
uint8_t bebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4], uint8_t *d = (uint8_t*)dest;
bytes[3], bytes[2], bytes[1], bytes[0]}; d[0] = bytes[7];
memcpy(dest, bebytes, 8); d[1] = bytes[6];
d[2] = bytes[5];
d[3] = bytes[4];
d[4] = bytes[3];
d[5] = bytes[2];
d[6] = bytes[1];
d[7] = bytes[0];
} }
return status; return status;
#else #else

17
pb_encode.c
View File

@@ -236,7 +236,11 @@ bool checkreturn pb_encode_fixed32(pb_ostream_t *stream, const void *value)
{ {
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
uint8_t *bytes = value; uint8_t *bytes = value;
uint8_t lebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]}; uint8_t lebytes[4];
lebytes[0] = bytes[3];
lebytes[1] = bytes[2];
lebytes[2] = bytes[1];
lebytes[3] = bytes[0];
return pb_write(stream, lebytes, 4); return pb_write(stream, lebytes, 4);
#else #else
return pb_write(stream, (uint8_t*)value, 4); return pb_write(stream, (uint8_t*)value, 4);
@@ -247,8 +251,15 @@ bool checkreturn pb_encode_fixed64(pb_ostream_t *stream, const void *value)
{ {
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
uint8_t *bytes[8] = value; uint8_t *bytes[8] = value;
uint8_t lebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4], uint8_t lebytes[8];
bytes[3], bytes[2], bytes[1], bytes[0]}; lebytes[0] = bytes[7];
lebytes[1] = bytes[6];
lebytes[2] = bytes[5];
lebytes[3] = bytes[4];
lebytes[4] = bytes[3];
lebytes[5] = bytes[2];
lebytes[6] = bytes[1];
lebytes[7] = bytes[0];
return pb_write(stream, lebytes, 8); return pb_write(stream, lebytes, 8);
#else #else
return pb_write(stream, (uint8_t*)value, 8); return pb_write(stream, (uint8_t*)value, 8);