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
Rename pb_field_iterator_t field 'current' to 'pos'.
[apps/agl-service-can-low-level.git]
/
pb_decode.h
diff --git
a/pb_decode.h
b/pb_decode.h
index
483665e
..
35de0a2
100644
(file)
--- a/
pb_decode.h
+++ b/
pb_decode.h
@@
-12,6
+12,10
@@
#include <stdbool.h>
#include "pb.h"
#include <stdbool.h>
#include "pb.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Lightweight input stream.
* You can provide a callback function for reading or use
* pb_istream_from_buffer.
/* Lightweight input stream.
* You can provide a callback function for reading or use
* pb_istream_from_buffer.
@@
-19,18
+23,25
@@
* Rules for callback:
* 1) Return false on IO errors. This will cause decoding to abort.
*
* Rules for callback:
* 1) Return false on IO errors. This will cause decoding to abort.
*
- * 2) If buf is NULL, read but don't store bytes ("skip input").
- *
- * 3) You can use state to store your own data (e.g. buffer pointer),
+ * 2) You can use state to store your own data (e.g. buffer pointer),
* and rely on pb_read to verify that no-body reads past bytes_left.
*
* and rely on pb_read to verify that no-body reads past bytes_left.
*
- *
4
) Your callback may be used with substreams, in which case bytes_left
+ *
3
) Your callback may be used with substreams, in which case bytes_left
* is different than from the main stream. Don't use bytes_left to compute
* any pointers.
*/
struct _pb_istream_t
{
* is different than from the main stream. Don't use bytes_left to compute
* any pointers.
*/
struct _pb_istream_t
{
+#ifdef PB_BUFFER_ONLY
+ /* Callback pointer is not used in buffer-only configuration.
+ * Having an int pointer here allows binary compatibility but
+ * gives an error if someone tries to assign callback function.
+ */
+ int *callback;
+#else
bool (*callback)(pb_istream_t *stream, uint8_t *buf, size_t count);
bool (*callback)(pb_istream_t *stream, uint8_t *buf, size_t count);
+#endif
+
void *state; /* Free field for use by callback implementation */
size_t bytes_left;
void *state; /* Free field for use by callback implementation */
size_t bytes_left;
@@
-104,4
+115,8
@@
bool pb_skip_varint(pb_istream_t *stream);
bool pb_skip_string(pb_istream_t *stream);
#endif
bool pb_skip_string(pb_istream_t *stream);
#endif
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
#endif
#endif