Fix ht default size test

in the line:

  size != 0 ? : (size = DEFAULT_HT_SIZE);

we should notice that the lack of ( ) around "size != 0" leads to the
following behavior: the compiler will try to evaluate

  "0 ? : (size = DEFAULT_HT_SIZE)"

and compare it to size, which is not the expected behavior.

Use a standard "if (cond)" test instead. The ? : expression is not
needed here anyway, it just complicates the code.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ht/lttng-ht.c b/liblttng-ht/lttng-ht.c
index d55c95373f6dcb2f1e25d4608f133455279b93f9..74e5ed4feb169cf803d90e7debea78b6c507722f 100644 (file)
--- a/liblttng-ht/lttng-ht.c
+++ b/liblttng-ht/lttng-ht.c
@@ -62,7 +62,8 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
        struct lttng_ht *ht;
 
        /* Test size */
-       size != 0 ? : (size = DEFAULT_HT_SIZE);
+       if (!size)
+               size = DEFAULT_HT_SIZE;
 
        ht = zmalloc(sizeof(*ht));
        if (ht == NULL) {