libubox: Plug a small memory leak.

[project/libubox.git] / utils.h

diff --git a/utils.h b/utils.h
index 5323c6f..e72d947 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <unistd.h>
 #include <time.h>
 
 /*
@@ -56,12 +57,14 @@ extern int __BUILD_BUG_ON_CONDITION_FAILED;
 #define BUILD_BUG_ON __BUILD_BUG_ON
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(CLOCK_MONOTONIC)
+#define LIBUBOX_COMPAT_CLOCK_GETTIME
 
-#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
 
@@ -159,22 +162,39 @@ static inline uint16_t __u_bswap16(uint16_t val)
 #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
+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);
 
-static inline void bitfield_set(unsigned long *bits, int bit)
+#define B64_ENCODE_LEN(_len)   ((((_len) + 2) / 3) * 4 + 1)
+#define B64_DECODE_LEN(_len)   (((_len) / 4) * 3 + 1)
+
+static inline unsigned int cbuf_order(unsigned int x)
 {
-       bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG));
+       return 32 - __builtin_clz(x - 1);
 }
 
-static inline bool bitfield_test(unsigned long *bits, int bit)
+static inline unsigned long cbuf_size(int order)
 {
-       return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG)));
+       unsigned long page_size = sysconf(_SC_PAGESIZE);
+       unsigned long ret = 1ULL << order;
+
+       if (ret < page_size)
+               ret = page_size;
+
+       return ret;
 }
 
+void *cbuf_alloc(unsigned int order);
+void cbuf_free(void *ptr, unsigned int order);
+
 #endif