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
Implement error message support for the encoder side.
[apps/agl-service-can-low-level.git]
/
pb_encode.h
diff --git
a/pb_encode.h
b/pb_encode.h
index
af6cc3c
..
bd6132b
100644
(file)
--- a/
pb_encode.h
+++ b/
pb_encode.h
@@
-9,6
+9,10
@@
#include <stdbool.h>
#include "pb.h"
#include <stdbool.h>
#include "pb.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Lightweight output stream.
* You can provide callback for writing or use pb_ostream_from_buffer.
*
/* Lightweight output stream.
* You can provide callback for writing or use pb_ostream_from_buffer.
*
@@
-28,15
+32,36
@@
*/
struct _pb_ostream_t
{
*/
struct _pb_ostream_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.
+ * Also, NULL pointer marks a 'sizing stream' that does not
+ * write anything.
+ */
+ int *callback;
+#else
bool (*callback)(pb_ostream_t *stream, const uint8_t *buf, size_t count);
bool (*callback)(pb_ostream_t *stream, const uint8_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). */
size_t bytes_written;
void *state; /* Free field for use by callback implementation */
size_t max_size; /* Limit number of output bytes written (or use SIZE_MAX). */
size_t bytes_written;
+
+#ifndef PB_NO_ERRMSG
+ const char *errmsg;
+#endif
};
pb_ostream_t pb_ostream_from_buffer(uint8_t *buf, size_t bufsize);
bool pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count);
};
pb_ostream_t pb_ostream_from_buffer(uint8_t *buf, size_t bufsize);
bool pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count);
+/* Stream type for use in computing message sizes */
+#ifndef PB_NO_ERRMSG
+#define PB_OSTREAM_SIZING {0,0,0,0,0}
+#else
+#define PB_OSTREAM_SIZING {0,0,0,0}
+#endif
+
/* Encode struct to given output stream.
* Returns true on success, false on any failure.
* The actual struct pointed to by src_struct must match the description in fields.
/* Encode struct to given output stream.
* Returns true on success, false on any failure.
* The actual struct pointed to by src_struct must match the description in fields.
@@
-99,5
+124,8
@@
bool pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *sr
* instead, it has the same functionality with a less confusing interface. */
bool pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
* instead, it has the same functionality with a less confusing interface. */
bool pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
#endif
#endif