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_encode.h
diff --git
a/pb_encode.h
b/pb_encode.h
index
900994a
..
d9909fb
100644
(file)
--- a/
pb_encode.h
+++ b/
pb_encode.h
@@
-3,8
+3,8
@@
* field descriptions created by nanopb_generator.py.
*/
* field descriptions created by nanopb_generator.py.
*/
-#ifndef
_PB_ENCODE_H_
-#define
_PB_ENCODE_H_
+#ifndef
PB_ENCODE_H_INCLUDED
+#define
PB_ENCODE_H_INCLUDED
#include "pb.h"
#include "pb.h"
@@
-24,7
+24,7
@@
extern "C" {
* 4) Substreams will modify max_size and bytes_written. Don't use them
* to calculate any pointers.
*/
* 4) Substreams will modify max_size and bytes_written. Don't use them
* to calculate any pointers.
*/
-struct
_pb_ostream_t
+struct
pb_ostream_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.
@@
-35,7
+35,7
@@
struct _pb_ostream_t
*/
int *callback;
#else
*/
int *callback;
#else
- bool (*callback)(pb_ostream_t *stream, const
uint8
_t *buf, size_t count);
+ bool (*callback)(pb_ostream_t *stream, const
pb_byte
_t *buf, size_t count);
#endif
void *state; /* Free field for use by callback implementation. */
size_t max_size; /* Limit number of output bytes written (or use SIZE_MAX). */
#endif
void *state; /* Free field for use by callback implementation. */
size_t max_size; /* Limit number of output bytes written (or use SIZE_MAX). */
@@
-71,6
+71,10
@@
bool pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_
*/
bool pb_encode_delimited(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
*/
bool pb_encode_delimited(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
+/* Encode the message to get the size of the encoded data, but do not store
+ * the data. */
+bool pb_get_encoded_size(size_t *size, const pb_field_t fields[], const void *src_struct);
+
/**************************************
* Functions for manipulating streams *
**************************************/
/**************************************
* Functions for manipulating streams *
**************************************/
@@
-82,7
+86,7
@@
bool pb_encode_delimited(pb_ostream_t *stream, const pb_field_t fields[], const
* Alternatively, you can use a custom stream that writes directly to e.g.
* a file or a network socket.
*/
* Alternatively, you can use a custom stream that writes directly to e.g.
* a file or a network socket.
*/
-pb_ostream_t pb_ostream_from_buffer(
uint8
_t *buf, size_t bufsize);
+pb_ostream_t pb_ostream_from_buffer(
pb_byte
_t *buf, size_t bufsize);
/* Pseudo-stream for measuring the size of a message without actually storing
* the encoded data.
/* Pseudo-stream for measuring the size of a message without actually storing
* the encoded data.
@@
-102,7
+106,7
@@
pb_ostream_t pb_ostream_from_buffer(uint8_t *buf, size_t bufsize);
/* Function to write into a pb_ostream_t stream. You can use this if you need
* to append or prepend some custom headers to the message.
*/
/* Function to write into a pb_ostream_t stream. You can use this if you need
* to append or prepend some custom headers to the message.
*/
-bool pb_write(pb_ostream_t *stream, const
uint8
_t *buf, size_t count);
+bool pb_write(pb_ostream_t *stream, const
pb_byte
_t *buf, size_t count);
/************************************************
/************************************************
@@
-126,7
+130,7
@@
bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
-bool pb_encode_string(pb_ostream_t *stream, const
uint8
_t *buffer, size_t size);
+bool pb_encode_string(pb_ostream_t *stream, const
pb_byte
_t *buffer, size_t size);
/* Encode a fixed32, sfixed32 or float value.
* You need to pass a pointer to a 4-byte wide C variable. */
/* Encode a fixed32, sfixed32 or float value.
* You need to pass a pointer to a 4-byte wide C variable. */