Correct some more warnings and cleanup.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/ulut/ul_cbuff.h b/ulut/ul_cbuff.h
index e766c84901a9e4036f72640d76e3510fe5222328..629546639504f76430e5402d1731051f898961c2 100644 (file)
--- a/ulut/ul_cbuff.h
+++ b/ulut/ul_cbuff.h
@@ -200,6 +200,8 @@ ul_cbuff_head_alloc(ul_cbuff_t *buff, ul_cbuff_put_info_t *put_info, unsigned in
 ul_cbuff_inline int
 ul_cbuff_head_put(ul_cbuff_t *buff, ul_cbuff_put_info_t *put_info)
 {
+  (void)buff;
+
   ul_cbuff_mark_ready(put_info->msg_head);
   put_info->msg_head=NULL;
   return 0;

diff --git a/ulut/ul_hptree.h b/ulut/ul_hptree.h
index 5f9db5944b83a3e441d4f57dfc6a1bf6feceea66..e3a5682fb7f42fc26fdba587be4a9d58904d22b3 100644 (file)
--- a/ulut/ul_hptree.h
+++ b/ulut/ul_hptree.h
@@ -24,6 +24,8 @@
 #ifndef _UL_HPTREE_H
 #define _UL_HPTREE_H
 
+#include "ul_utdefs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -49,7 +51,10 @@ typedef struct{
 \
 static inline cust_item_t * \
 cust_prefix##_node2item(const cust_root_t *root, const ul_hpt_node_t *node) \
-  {return (cust_item_t*)((char*)node-(long)&((cust_item_t*)0)->cust_item_node);}\
+{\
+  (void)root;\
+  return UL_CONTAINEROF(node, cust_item_t, cust_item_node);\
+}\
 \
 static inline cust_key_t *\
 cust_prefix##_node2key(const cust_root_t *root, ul_hpt_node_t *node)\

diff --git a/ulut/ul_htimmstime.c b/ulut/ul_htimmstime.c
index 2cc6bc8276bfb02dda7d1b1e4e7b24b9c27817d3..5cd9b265f5a0c53b167342c6fb347f3bf2780bf5 100644 (file)
--- a/ulut/ul_htimmstime.c
+++ b/ulut/ul_htimmstime.c
@@ -133,7 +133,7 @@ static void ul_mstime_root_htimer_put(ul_htimer_queue_t *queue)
 static int ul_mstime_root_htimer_current_time(int options, ul_htim_time_t *htimer_time)
 {
   ul_mstime_t mstime;
-  (options);
+  (void)options;
 
   ul_mstime_now(&mstime);
   ul_mstime2htime(htimer_time, &mstime);