blobmsg_json: simplify add_separator and fix thread-safety

[project/libubox.git] / utils.h

diff --git a/utils.h b/utils.h
index 11783bc..d00e76b 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdint.h>

+#include <stdbool.h>

 #include <time.h>
 
 /*
 #include <time.h>
 
 /*


@@ -57,10 +58,11 @@ extern int __BUILD_BUG_ON_CONDITION_FAILED;
 
 #ifdef __APPLE__
 
 
 #ifdef __APPLE__
 

-#define CLOCK_REALTIME 0
-#define CLOCK_MONOTONIC        1
+#include <mach/clock_types.h>
+#define CLOCK_REALTIME CALENDAR_CLOCK
+#define CLOCK_MONOTONIC        SYSTEM_CLOCK

 
 

-void clock_gettime(int type, struct timespec *tv);
+int clock_gettime(int type, struct timespec *tv);

 
 #endif
 
 
 #endif
 


@@ -77,17 +79,14 @@ void clock_gettime(int type, struct timespec *tv);
 #elif defined(__APPLE__)
 #include <machine/endian.h>
 #include <machine/byte_order.h>
 #elif defined(__APPLE__)
 #include <machine/endian.h>
 #include <machine/byte_order.h>

-#define bswap_16(x) OSSwapInt16(x)

 #define bswap_32(x) OSSwapInt32(x)
 #define bswap_64(x) OSSwapInt64(x)
 #elif defined(__FreeBSD__)
 #include <sys/endian.h>
 #define bswap_32(x) OSSwapInt32(x)
 #define bswap_64(x) OSSwapInt64(x)
 #elif defined(__FreeBSD__)
 #include <sys/endian.h>

-#define bswap_16(x) bswap16(x)

 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #else
 #include <machine/endian.h>
 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #else
 #include <machine/endian.h>

-#define bswap_16(x) swap16(x)

 #define bswap_32(x) swap32(x)
 #define bswap_64(x) swap64(x)
 #endif
 #define bswap_32(x) swap32(x)
 #define bswap_64(x) swap64(x)
 #endif


@@ -102,33 +101,46 @@ void clock_gettime(int type, struct timespec *tv);
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
 #endif
 
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
 #endif
 

-#if __BYTE_ORDER == __LITTLE_ENDIAN
+static inline uint16_t __u_bswap16(uint16_t val)
+{
+       return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8);
+}

 
 #if _GNUC_MIN_VER(4, 2)
 
 #if _GNUC_MIN_VER(4, 2)

+#define __u_bswap32(x) __builtin_bswap32(x)
+#define __u_bswap64(x) __builtin_bswap64(x)
+#else
+#define __u_bswap32(x) bswap_32(x)
+#define __u_bswap64(x) bswap_64(x)
+#endif

 
 

-#define __bswap_constant_16(x) ((uint16_t)((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)))
+#if __BYTE_ORDER == __LITTLE_ENDIAN

 
 

-#define cpu_to_be64(x) __builtin_bswap64(x)
-#define cpu_to_be32(x) __builtin_bswap32(x)
-#define cpu_to_be16(x) __bswap_constant_16((uint16_t) x)
+#define cpu_to_be64(x) __u_bswap64(x)
+#define cpu_to_be32(x) __u_bswap32(x)
+#define cpu_to_be16(x) __u_bswap16((uint16_t) (x))

 
 

-#define be64_to_cpu(x) __builtin_bswap64(x)
-#define be32_to_cpu(x) __builtin_bswap32(x)
-#define be16_to_cpu(x) __bswap_constant_16((uint16_t) x)
+#define be64_to_cpu(x) __u_bswap64(x)
+#define be32_to_cpu(x) __u_bswap32(x)
+#define be16_to_cpu(x) __u_bswap16((uint16_t) (x))

 
 

-#else /* __GNUC__ */
+#define cpu_to_le64(x) (x)
+#define cpu_to_le32(x) (x)
+#define cpu_to_le16(x) (x)

 
 

-#define cpu_to_be64(x) bswap_64(x)
-#define cpu_to_be32(x) bswap_32(x)
-#define cpu_to_be16(x) bswap_16(x)
+#define le64_to_cpu(x) (x)
+#define le32_to_cpu(x) (x)
+#define le16_to_cpu(x) (x)

 
 

-#define be64_to_cpu(x) bswap_64(x)
-#define be32_to_cpu(x) bswap_32(x)
-#define be16_to_cpu(x) bswap_16(x)
+#else /* __BYTE_ORDER == __LITTLE_ENDIAN */

 
 

-#endif /* __GNUC__ */
+#define cpu_to_le64(x) __u_bswap64(x)
+#define cpu_to_le32(x) __u_bswap32(x)
+#define cpu_to_le16(x) __u_bswap16((uint16_t) (x))

 
 

-#else /* __BYTE_ORDER == __LITTLE_ENDIAN */
+#define le64_to_cpu(x) __u_bswap64(x)
+#define le32_to_cpu(x) __u_bswap32(x)
+#define le16_to_cpu(x) __u_bswap16((uint16_t) (x))

 
 #define cpu_to_be64(x) (x)
 #define cpu_to_be32(x) (x)
 
 #define cpu_to_be64(x) (x)
 #define cpu_to_be32(x) (x)


@@ -144,4 +156,40 @@ void clock_gettime(int type, struct timespec *tv);
 #define __packed __attribute__((packed))
 #endif
 
 #define __packed __attribute__((packed))
 #endif
 

+#ifndef __constructor
+#define __constructor __attribute__((constructor))
+#endif
+
+#ifndef __destructor
+#define __destructor __attribute__((destructor))
+#endif
+
+#ifndef __hidden
+#define __hidden __attribute__((visibility("hidden")))
+#endif
+
+#ifndef BITS_PER_LONG
+#define BITS_PER_LONG (8 * sizeof(unsigned long))
+#endif
+
+#define BITFIELD_SIZE(_n) (((_n) + (BITS_PER_LONG - 1)) / BITS_PER_LONG)
+
+static inline void bitfield_set(unsigned long *bits, int bit)
+{
+       bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG));
+}
+
+static inline bool bitfield_test(unsigned long *bits, int bit)
+{
+       return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG)));
+}
+
+int b64_encode(const void *src, size_t src_len,
+              void *dest, size_t dest_len);
+
+int b64_decode(const void *src, void *dest, size_t dest_len);
+
+#define B64_ENCODE_LEN(_len)   ((((_len) + 2) / 3) * 4 + 1)
+#define B64_DECODE_LEN(_len)   (((_len) / 4) * 3 + 1)
+

 #endif
 #endif