Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/hashtable.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 7fdf6b0..408f98f 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -156,7 +156,7 @@ hashtable_put(struct qb_map *map, const void* key, const void* value)
struct hash_node *hash_node;
hash_entry = hash_table->hash_fn(key, hash_table->order);
- hashtable_rm_with_hash(map, key, hash_entry);
+ (void)hashtable_rm_with_hash(map, key, hash_entry);
hash_node = malloc(sizeof(struct hash_node));
if (hash_node == NULL) {
errno = ENOMEM;
--
1.7.6
Show replies by date
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
check | 2 +-
lib/Makefile.am | 2 +-
lib/skiplist.c | 4 ++--
tests/check_map.c | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/check b/check
index ef81fce..c9bfa70 100755
--- a/check
+++ b/check
@@ -174,7 +174,7 @@ case $command in
rpm)
check_rpm
;;
- bsd)
+ dist)
check_dist
;;
notimerfd)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a778f3c..af9db4f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@
MAINTAINERCLEANFILES = Makefile.in
-noinst_HEADERS = ipc_int.h util_int.h ringbuffer_int.h loop_int.h log_int.h
+noinst_HEADERS = ipc_int.h util_int.h ringbuffer_int.h loop_int.h log_int.h
map_int.h
#
# Here are a set of rules to help you update your library version information:
diff --git a/lib/skiplist.c b/lib/skiplist.c
index 946a8fe..84fe12f 100644
--- a/lib/skiplist.c
+++ b/lib/skiplist.c
@@ -21,8 +21,8 @@
#include <os_base.h>
#include <assert.h>
-#include "qbdefs.h"
-#include "qbmap.h"
+#include <qb/qbdefs.h>
+#include <qb/qbmap.h>
#include "map_int.h"
#define SKIPLIST_LEVEL_MAX 8
diff --git a/tests/check_map.c b/tests/check_map.c
index 23a0d86..47b66f6 100644
--- a/tests/check_map.c
+++ b/tests/check_map.c
@@ -22,9 +22,9 @@
*/
#include "os_base.h"
#include <check.h>
-#include "qbdefs.h"
-#include "qblog.h"
-#include "qbmap.h"
+#include <qb/qbdefs.h>
+#include <qb/qblog.h>
+#include <qb/qbmap.h>
char chars[] =
"0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz";
--
1.7.6
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qbdefs.h | 4 ----
lib/log.c | 1 +
lib/util_int.h | 8 ++++++++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/qb/qbdefs.h b/include/qb/qbdefs.h
index 25eb1bf..21d3627 100644
--- a/include/qb/qbdefs.h
+++ b/include/qb/qbdefs.h
@@ -79,10 +79,6 @@ extern "C" {
#define typeof __typeof__
#endif /* ANSI */
-#if defined (__GNUC__) && defined (__STRICT_ANSI__)
-#define va_copy(_a, _b) *_a = *_b
-#endif /* ANSI */
-
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
#define QB_GNUC_DEPRECATED \
__attribute__((__deprecated__))
diff --git a/lib/log.c b/lib/log.c
index 0832f4f..d931249 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -32,6 +32,7 @@
#include <qb/qbutil.h>
#include <qb/qbarray.h>
#include "log_int.h"
+#include "util_int.h"
static struct qb_log_target conf[32];
static uint32_t conf_used_max = 0;
diff --git a/lib/util_int.h b/lib/util_int.h
index 1b1169f..b26b79c 100644
--- a/lib/util_int.h
+++ b/lib/util_int.h
@@ -22,6 +22,14 @@
#include <qb/qblog.h>
+#if !defined (va_copy)
+#if defined (__va_copy)
+#define va_copy(_a, _b) __va_copy(_a, _b)
+#else
+#define va_copy(_a, _b) memcpy(&_a, &_b, sizeof(va_list))
+#endif /* !__va_copy */
+#endif /* !va_copy */
+
/**
* This is used internally by libqb.
*
--
1.7.6