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
pb_istream_from_buffer: add const to prototype
[apps/agl-service-can-low-level.git]
/
pb_decode.c
diff --git
a/pb_decode.c
b/pb_decode.c
index
4d8c7cb
..
0bf8bef
100644
(file)
--- a/
pb_decode.c
+++ b/
pb_decode.c
@@
-74,8
+74,8
@@
static const pb_decoder_t PB_DECODERS[PB_LTYPES_COUNT] = {
static bool checkreturn buf_read(pb_istream_t *stream, uint8_t *buf, size_t count)
{
static bool checkreturn buf_read(pb_istream_t *stream, uint8_t *buf, size_t count)
{
-
uint8_t *source = (
uint8_t*)stream->state;
- stream->state =
sourc
e + count;
+
const uint8_t *source = (const
uint8_t*)stream->state;
+ stream->state =
(uint8_t*)stream->stat
e + count;
if (buf != NULL)
{
if (buf != NULL)
{
@@
-131,7
+131,7
@@
static bool checkreturn pb_readbyte(pb_istream_t *stream, uint8_t *buf)
if (!stream->callback(stream, buf, 1))
PB_RETURN_ERROR(stream, "io error");
#else
if (!stream->callback(stream, buf, 1))
PB_RETURN_ERROR(stream, "io error");
#else
- *buf = *(uint8_t*)stream->state;
+ *buf = *(
const
uint8_t*)stream->state;
stream->state = (uint8_t*)stream->state + 1;
#endif
stream->state = (uint8_t*)stream->state + 1;
#endif
@@
-140,15
+140,23
@@
static bool checkreturn pb_readbyte(pb_istream_t *stream, uint8_t *buf)
return true;
}
return true;
}
-pb_istream_t pb_istream_from_buffer(uint8_t *buf, size_t bufsize)
+pb_istream_t pb_istream_from_buffer(
const
uint8_t *buf, size_t bufsize)
{
pb_istream_t stream;
{
pb_istream_t stream;
+ /* Cast away the const from buf without a compiler error. We are
+ * careful to use it only in a const manner in the callbacks.
+ */
+ union {
+ void *state;
+ const void *c_state;
+ } state;
#ifdef PB_BUFFER_ONLY
stream.callback = NULL;
#else
stream.callback = &buf_read;
#endif
#ifdef PB_BUFFER_ONLY
stream.callback = NULL;
#else
stream.callback = &buf_read;
#endif
- stream.state = buf;
+ state.c_state = buf;
+ stream.state = state.state;
stream.bytes_left = bufsize;
#ifndef PB_NO_ERRMSG
stream.errmsg = NULL;
stream.bytes_left = bufsize;
#ifndef PB_NO_ERRMSG
stream.errmsg = NULL;
@@
-398,6
+406,9
@@
static bool checkreturn decode_static_field(pb_istream_t *stream, pb_wire_type_t
*(pb_size_t*)iter->pSize = iter->pos->tag;
if (PB_LTYPE(type) == PB_LTYPE_SUBMESSAGE)
{
*(pb_size_t*)iter->pSize = iter->pos->tag;
if (PB_LTYPE(type) == PB_LTYPE_SUBMESSAGE)
{
+ /* We memset to zero so that any callbacks are set to NULL.
+ * Then set any default values. */
+ memset(iter->pData, 0, iter->pos->data_size);
pb_message_set_to_defaults((const pb_field_t*)iter->pos->ptr, iter->pData);
}
return func(stream, iter->pos, iter->pData);
pb_message_set_to_defaults((const pb_field_t*)iter->pos->ptr, iter->pData);
}
return func(stream, iter->pos, iter->pData);
@@
-883,7
+894,8
@@
bool checkreturn pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[
if (PB_HTYPE(iter.pos->type) == PB_HTYPE_REQUIRED
&& iter.required_field_index < PB_MAX_REQUIRED_FIELDS)
{
if (PB_HTYPE(iter.pos->type) == PB_HTYPE_REQUIRED
&& iter.required_field_index < PB_MAX_REQUIRED_FIELDS)
{
- fields_seen[iter.required_field_index >> 3] |= (uint8_t)(1 << (iter.required_field_index & 7));
+ uint8_t tmp = (uint8_t)(1 << (iter.required_field_index & 7));
+ fields_seen[iter.required_field_index >> 3] |= tmp;
}
if (!decode_field(stream, wire_type, &iter))
}
if (!decode_field(stream, wire_type, &iter))
@@
-1063,6
+1075,9
@@
void pb_release(const pb_field_t fields[], void *dest_struct)
{
pb_field_iter_t iter;
{
pb_field_iter_t iter;
+ if (!dest_struct)
+ return; /* Ignore NULL pointers, similar to free() */
+
if (!pb_field_iter_begin(&iter, fields, dest_struct))
return; /* Empty message type */
if (!pb_field_iter_begin(&iter, fields, dest_struct))
return; /* Empty message type */