From cef9837d3c15bb43892db981bb9e4a2e4bef080a Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sun, 19 Oct 2014 02:11:05 +0200 Subject: [PATCH] Correct some more warnings and cleanup. Signed-off-by: Pavel Pisa --- ulut/ul_cbuff.h | 2 ++ ulut/ul_hptree.h | 7 ++++++- ulut/ul_htimmstime.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ulut/ul_cbuff.h b/ulut/ul_cbuff.h index e766c84..6295466 100644 --- 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 5f9db59..e3a5682 100644 --- 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 2cc6bc8..5cd9b26 100644 --- 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); -- 2.39.2