uloop: allow specifying a timeout for uloop_run()

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 84997a6..7977298 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -31,6 +31,7 @@ enum blobmsg_type {
        BLOBMSG_TYPE_INT32,
        BLOBMSG_TYPE_INT16,
        BLOBMSG_TYPE_INT8,
+       BLOBMSG_TYPE_DOUBLE,
        __BLOBMSG_TYPE_LAST,
        BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1,
        BLOBMSG_TYPE_BOOL = BLOBMSG_TYPE_INT8,
@@ -114,6 +115,18 @@ int blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
                       const void *data, unsigned int len);
 
 static inline int
+blobmsg_add_double(struct blob_buf *buf, const char *name, double val)
+{
+       union {
+               double d;
+               uint64_t u64;
+       } v;
+       v.d = val;
+       v.u64 = cpu_to_be64(v.u64);
+       return blobmsg_add_field(buf, BLOBMSG_TYPE_DOUBLE, name, &v.u64, 8);
+}
+
+static inline int
 blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
 {
        return blobmsg_add_field(buf, BLOBMSG_TYPE_INT8, name, &val, 1);
@@ -212,6 +225,16 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
        return tmp;
 }
 
+static inline double blobmsg_get_double(struct blob_attr *attr)
+{
+       union {
+               double d;
+               uint64_t u64;
+       } v;
+       v.u64 = blobmsg_get_u64(attr);
+       return v.d;
+}
+
 static inline char *blobmsg_get_string(struct blob_attr *attr)
 {
        if (!attr)
@@ -233,7 +256,7 @@ int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, .
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
        for (rem = attr ? blobmsg_data_len(attr) : 0, \
-            pos = attr ? blobmsg_data(attr) : 0; \
+            pos = (struct blob_attr *) (attr ? blobmsg_data(attr) : NULL); \
             rem > 0 && (blob_pad_len(pos) <= rem) && \
             (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
             rem -= blob_pad_len(pos), pos = blob_next(pos))