Clean-up append_list_to_probes()

[lttng-tools.git] / src / common / hashtable / rculfhash.c

diff --git a/src/common/hashtable/rculfhash.c b/src/common/hashtable/rculfhash.c
index ee09afd1b7201df7c1e6ea4528686cb593e8c96e..fb44640bdc4946c8ca7c1f8a540be38f40346e12 100644 (file)
--- a/src/common/hashtable/rculfhash.c
+++ b/src/common/hashtable/rculfhash.c
@@ -278,6 +278,8 @@
 #include "rculfhash-internal.h"
 #include "urcu-flavor.h"
 
+#include <common/common.h>
+
 /*
  * We need to lock pthread exit, which deadlocks __nptl_setxid in the runas
  * clone.  This work-around will be allowed to be removed when runas.c gets
@@ -1781,7 +1783,7 @@ int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr)
        }
 #endif
        while (uatomic_read(&ht->in_progress_resize))
-               poll(NULL, 0, 100);     /* wait for 100ms */
+               (void) poll(NULL, 0, 100); /* wait for 100ms */
        ret = cds_lfht_delete_bucket(ht);
        if (ret)
                return ret;
@@ -1981,7 +1983,7 @@ void __cds_lfht_resize_lazy_launch(struct cds_lfht *ht)
                        uatomic_dec(&ht->in_progress_resize);
                        return;
                }
-               work = malloc(sizeof(*work));
+               work = zmalloc(sizeof(*work));
                if (work == NULL) {
                        dbg_printf("error allocating resize work, bailing out\n");
                        uatomic_dec(&ht->in_progress_resize);