jshn: in json_get_values(), handle json_select errors

[project/libubox.git] / blob.h

diff --git a/blob.h b/blob.h
index 44266e8dcb0b96193d75e7da67074ee17fe68408..fa430a859605394f5677bfd19a0ac1a372e9ff43 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -28,6 +28,8 @@
 
 #include "utils.h"
 
+#define BLOB_COOKIE            0x01234567
+
 enum {
        BLOB_ATTR_UNSPEC,
        BLOB_ATTR_NESTED,
@@ -190,6 +192,7 @@ extern struct blob_attr *blob_put(struct blob_buf *buf, int id, const void *ptr,
 extern bool blob_check_type(const void *ptr, int len, int type);
 extern int blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max);
 extern struct blob_attr *blob_memdup(struct blob_attr *attr);
+extern struct blob_attr *blob_put_raw(struct blob_buf *buf, const void *ptr, int len);
 
 static inline struct blob_attr *
 blob_put_string(struct blob_buf *buf, int id, const char *str)
@@ -231,16 +234,17 @@ blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
 
 #define __blob_for_each_attr(pos, attr, rem) \
        for (pos = (void *) attr; \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 
 #define blob_for_each_attr(pos, attr, rem) \
-       for (rem = blob_len(attr), pos = blob_data(attr); \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+       for (rem = attr ? blob_len(attr) : 0, \
+            pos = attr ? blob_data(attr) : 0; \
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 
 #endif