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
Remove use of relative paths
[apps/agl-service-can-low-level.git]
/
pb_decode.h
diff --git
a/pb_decode.h
b/pb_decode.h
index
8dc6740
..
a426bdd
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 */
@@
-103,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);
/************************************************
/************************************************
@@
-126,6
+126,10
@@
bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
* int64, uint32 and uint64 field types. */
bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
* int64, uint32 and uint64 field types. */
bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
+/* Decode an integer in the varint format. This works for bool, enum, int32,
+ * and uint32 field types. */
+bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest);
+
/* Decode an integer in the zig-zagged svarint format. This works for sint32
* and sint64. */
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
/* Decode an integer in the zig-zagged svarint format. This works for sint32
* and sint64. */
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
@@
-140,7
+144,7
@@
bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
/* Make a limited-length substream for reading a PB_WT_STRING field. */
bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
/* Make a limited-length substream for reading a PB_WT_STRING field. */
bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
-
void
pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
+
bool
pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
#ifdef __cplusplus
} /* extern "C" */
#ifdef __cplusplus
} /* extern "C" */