Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add some missing 'static' specifiers
[apps/agl-service-can-low-level.git]
/
pb_encode.c
diff --git
a/pb_encode.c
b/pb_encode.c
index
cbf7a66
..
1eb9473
100644
(file)
--- a/
pb_encode.c
+++ b/
pb_encode.c
@@
-3,7
+3,6
@@
* 2011 Petteri Aimonen <jpa@kapsi.fi>
*/
* 2011 Petteri Aimonen <jpa@kapsi.fi>
*/
-#define NANOPB_INTERNALS
#include "pb.h"
#include "pb_encode.h"
#include "pb.h"
#include "pb_encode.h"
@@
-174,11
+173,12
@@
static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
return false;
/* Normally the data is stored directly in the array entries, but
return false;
/* Normally the data is stored directly in the array entries, but
- * for pointer-type string
fields, the array entries are actually
- *
string pointers. So we have to dereference once more to get to
- *
the character
data. */
+ * for pointer-type string
and bytes fields, the array entries are
+ *
actually pointers themselves also. So we have to dereference once
+ *
more to get to the actual
data. */
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER &&
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER &&
- PB_LTYPE(field->type) == PB_LTYPE_STRING)
+ (PB_LTYPE(field->type) == PB_LTYPE_STRING ||
+ PB_LTYPE(field->type) == PB_LTYPE_BYTES))
{
if (!func(stream, field, *(const void* const*)p))
return false;
{
if (!func(stream, field, *(const void* const*)p))
return false;
@@
-195,9
+195,9
@@
static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
return true;
}
return true;
}
-/* Encode a field with static
allocation, i.e. one whose data is stored
- * i
n the structure itself
. */
-static bool checkreturn encode_
stat
ic_field(pb_ostream_t *stream,
+/* Encode a field with static
or pointer allocation, i.e. one whose data
+ * i
s available to the encoder directly
. */
+static bool checkreturn encode_
bas
ic_field(pb_ostream_t *stream,
const pb_field_t *field, const void *pData)
{
pb_encoder_t func;
const pb_field_t *field, const void *pData)
{
pb_encoder_t func;
@@
-226,7
+226,7
@@
static bool checkreturn encode_static_field(pb_ostream_t *stream,
{
case PB_HTYPE_REQUIRED:
if (!pData)
{
case PB_HTYPE_REQUIRED:
if (!pData)
-
return false
;
+
PB_RETURN_ERROR(stream, "missing required field")
;
if (!pb_encode_tag_for_field(stream, field))
return false;
if (!func(stream, field, pData))
if (!pb_encode_tag_for_field(stream, field))
return false;
if (!func(stream, field, pData))
@@
-285,7
+285,7
@@
static bool checkreturn encode_field(pb_ostream_t *stream,
{
case PB_ATYPE_STATIC:
case PB_ATYPE_POINTER:
{
case PB_ATYPE_STATIC:
case PB_ATYPE_POINTER:
- return encode_
stat
ic_field(stream, field, pData);
+ return encode_
bas
ic_field(stream, field, pData);
case PB_ATYPE_CALLBACK:
return encode_callback_field(stream, field, pData);
case PB_ATYPE_CALLBACK:
return encode_callback_field(stream, field, pData);
@@
-404,9
+404,9
@@
bool checkreturn pb_encode_svarint(pb_ostream_t *stream, int64_t value)
{
uint64_t zigzagged;
if (value < 0)
{
uint64_t zigzagged;
if (value < 0)
- zigzagged =
(uint64_t)(~(value << 1)
);
+ zigzagged =
~((uint64_t)value << 1
);
else
else
- zigzagged = (uint64_t)
(value << 1)
;
+ zigzagged = (uint64_t)
value << 1
;
return pb_encode_varint(stream, zigzagged);
}
return pb_encode_varint(stream, zigzagged);
}
@@
-447,7
+447,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, uint32_t field_number)
{
bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number)
{
- uint64_t tag =
wiretype | (field_number << 3)
;
+ uint64_t tag =
((uint64_t)field_number << 3) | wiretype
;
return pb_encode_varint(stream, tag);
}
return pb_encode_varint(stream, tag);
}
@@
-499,7
+499,12
@@
bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
bool status;
if (!pb_encode(&substream, fields, src_struct))
bool status;
if (!pb_encode(&substream, fields, src_struct))
+ {
+#ifndef PB_NO_ERRMSG
+ stream->errmsg = substream.errmsg;
+#endif
return false;
return false;
+ }
size = substream.bytes_written;
size = substream.bytes_written;
@@
-538,7
+543,7
@@
bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
/* Field encoders */
/* Field encoders */
-bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
int64_t value = 0;
{
int64_t value = 0;
@@
-556,7
+561,7
@@
bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, co
return pb_encode_varint(stream, (uint64_t)value);
}
return pb_encode_varint(stream, (uint64_t)value);
}
-bool checkreturn pb_enc_uvarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_uvarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
uint64_t value = 0;
{
uint64_t value = 0;
@@
-570,7
+575,7
@@
bool checkreturn pb_enc_uvarint(pb_ostream_t *stream, const pb_field_t *field, c
return pb_encode_varint(stream, value);
}
return pb_encode_varint(stream, value);
}
-bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
int64_t value = 0;
{
int64_t value = 0;
@@
-584,36
+589,38
@@
bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, c
return pb_encode_svarint(stream, value);
}
return pb_encode_svarint(stream, value);
}
-bool checkreturn pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
UNUSED(field);
return pb_encode_fixed64(stream, src);
}
{
UNUSED(field);
return pb_encode_fixed64(stream, src);
}
-bool checkreturn pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
UNUSED(field);
return pb_encode_fixed32(stream, src);
}
{
UNUSED(field);
return pb_encode_fixed32(stream, src);
}
-bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
{
const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
-
- if (
PB_ATYPE(field->type) == PB_ATYPE_POINTER
)
+
+ if (
src == NULL
)
{
{
- return pb_encode_string(stream, *(const uint8_t**)bytes->bytes, bytes->size);
+ /* Threat null pointer as an empty bytes field */
+ return pb_encode_string(stream, NULL, 0);
}
}
- else
+
+ if (PB_ATYPE(field->type) == PB_ATYPE_STATIC &&
+ PB_BYTES_ARRAY_T_ALLOCSIZE(bytes->size) > field->data_size)
{
{
- if (bytes->size + offsetof(pb_bytes_array_t, bytes) > field->data_size)
- PB_RETURN_ERROR(stream, "bytes size exceeded");
-
- return pb_encode_string(stream, bytes->bytes, bytes->size);
+ PB_RETURN_ERROR(stream, "bytes size exceeded");
}
}
+
+ return pb_encode_string(stream, bytes->bytes, bytes->size);
}
}
-bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
/* strnlen() is not always available, so just use a loop */
size_t size = 0;
{
/* strnlen() is not always available, so just use a loop */
size_t size = 0;
@@
-623,16
+630,23
@@
bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, co
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
max_size = (size_t)-1;
if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
max_size = (size_t)-1;
- while (size < max_size && *p != '\0')
+ if (src == NULL)
+ {
+ size = 0; /* Threat null pointer as an empty string */
+ }
+ else
{
{
- size++;
- p++;
+ while (size < max_size && *p != '\0')
+ {
+ size++;
+ p++;
+ }
}
return pb_encode_string(stream, (const uint8_t*)src, size);
}
}
return pb_encode_string(stream, (const uint8_t*)src, size);
}
-bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+
static
bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
{
if (field->ptr == NULL)
PB_RETURN_ERROR(stream, "invalid field descriptor");
{
if (field->ptr == NULL)
PB_RETURN_ERROR(stream, "invalid field descriptor");