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
Fix error in STATIC_ASSERT with multiple files (issue #203)
[apps/agl-service-can-low-level.git]
/
pb_decode.h
diff --git
a/pb_decode.h
b/pb_decode.h
index
2e1da5a
..
1d9bb19
100644
(file)
--- a/
pb_decode.h
+++ b/
pb_decode.h
@@
-3,8
+3,8
@@
* field descriptions created by nanopb_generator.py.
*/
* field descriptions created by nanopb_generator.py.
*/
-#ifndef
_PB_DECODE_H_
-#define
_PB_DECODE_H_
+#ifndef
PB_DECODE_H_INCLUDED
+#define
PB_DECODE_H_INCLUDED
#include "pb.h"
#include "pb.h"
@@
-25,7
+25,7
@@
extern "C" {
* is different than from the main stream. Don't use bytes_left to compute
* any pointers.
*/
* is different than from the main stream. Don't use bytes_left to compute
* any pointers.
*/
-struct
_pb_istream_t
+struct
pb_istream_s
{
#ifdef PB_BUFFER_ONLY
/* Callback pointer is not used in buffer-only configuration.
{
#ifdef PB_BUFFER_ONLY
/* Callback pointer is not used in buffer-only configuration.
@@
-34,7
+34,7
@@
struct _pb_istream_t
*/
int *callback;
#else
*/
int *callback;
#else
- bool (*callback)(pb_istream_t *stream,
uint8
_t *buf, size_t count);
+ bool (*callback)(pb_istream_t *stream,
pb_byte
_t *buf, size_t count);
#endif
void *state; /* Free field for use by callback implementation */
#endif
void *state; /* Free field for use by callback implementation */
@@
-73,6
+73,9
@@
bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struc
*
* This can also be used for 'merging' two messages, i.e. update only the
* fields that exist in the new message.
*
* This can also be used for 'merging' two messages, i.e. update only the
* fields that exist in the new message.
+ *
+ * Note: If this function returns with an error, it will not release any
+ * dynamically allocated fields. You will need to call pb_release() yourself.
*/
bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
*/
bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
@@
-84,8
+87,8
@@
bool pb_decode_delimited(pb_istream_t *stream, const pb_field_t fields[], void *
#ifdef PB_ENABLE_MALLOC
/* Release any allocated pointer fields. If you use dynamic allocation, you should
#ifdef PB_ENABLE_MALLOC
/* Release any allocated pointer fields. If you use dynamic allocation, you should
- * call this for any
decoded message when you are done with it. You also need to
- *
free messages even if pb_decode() returned with error
.
+ * call this for any
successfully decoded message when you are done with it. If
+ *
pb_decode() returns with an error, the message is already released
.
*/
void pb_release(const pb_field_t fields[], void *dest_struct);
#endif
*/
void pb_release(const pb_field_t fields[], void *dest_struct);
#endif
@@
-100,12
+103,12
@@
void pb_release(const pb_field_t fields[], void *dest_struct);
* Alternatively, you can use a custom stream that reads directly from e.g.
* a file or a network socket.
*/
* Alternatively, you can use a custom stream that reads directly from e.g.
* a file or a network socket.
*/
-pb_istream_t pb_istream_from_buffer(
uint8
_t *buf, size_t bufsize);
+pb_istream_t pb_istream_from_buffer(
const pb_byte
_t *buf, size_t bufsize);
/* Function to read from a pb_istream_t. You can use this if you need to
* read some custom header data, or to read data in field callbacks.
*/
/* Function to read from a pb_istream_t. You can use this if you need to
* read some custom header data, or to read data in field callbacks.
*/
-bool pb_read(pb_istream_t *stream,
uint8
_t *buf, size_t count);
+bool pb_read(pb_istream_t *stream,
pb_byte
_t *buf, size_t count);
/************************************************
/************************************************