Silent some GCC warnings.

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

diff --git a/ulut/ul_cbuff.h b/ulut/ul_cbuff.h
index a6fd8d8c06cc64a80d196cb6828bdbc58e1e803a..e766c84901a9e4036f72640d76e3510fe5222328 100644 (file)
--- a/ulut/ul_cbuff.h
+++ b/ulut/ul_cbuff.h
@@ -263,13 +263,13 @@ ul_cbuff_tail_attach(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info, int mode
 {
   ul_cbuff_state_t *state=buff->state;
   ul_cbuff_msg_head_t *msg_head;
+  (void)mode;
 
   if(state->readers>0)
     msg_head=(ul_cbuff_msg_head_t *)(buff->buff_start+state->head);
-  else if(state->readers==0)
+  else /* no reader yet .. state->readers==0 */
     msg_head=(ul_cbuff_msg_head_t *)(buff->buff_start+state->lasttail);
-  if(state->readers>=0)
-    state->readers++;
+  state->readers++;
   tail_info->msg_head=msg_head;
   tail_info->data.ptr=NULL;
   return 0;
@@ -278,6 +278,8 @@ ul_cbuff_tail_attach(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info, int mode
 ul_cbuff_inline int
 ul_cbuff_tail_incontact(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info)
 {
+  (void)buff;
+
   if(tail_info->msg_head==NULL){
     return 0;
   }

diff --git a/ulut/ul_gavl.h b/ulut/ul_gavl.h
index d27f812b97eb26c5cde956ba4dcecd1a149856db..9962bb57335e1f0f7ce54c07fe1120d3f5376fbd 100644 (file)
--- a/ulut/ul_gavl.h
+++ b/ulut/ul_gavl.h
@@ -425,7 +425,10 @@ typedef struct{
 \
 static inline cust_item_t * \
 cust_prefix##_node2item(const cust_root_t *root, const gavl_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, gavl_node_t *node)\

diff --git a/ulut/ul_gavlflesint.h b/ulut/ul_gavlflesint.h
index 7eef3b4683b29234cf80129f6cbdc10e4fe60158..99cf877f90c48deb9dac864e54f39f6aa4ff757d 100644 (file)
--- a/ulut/ul_gavlflesint.h
+++ b/ulut/ul_gavlflesint.h
@@ -37,7 +37,10 @@ extern "C" {
 \
 static inline cust_item_t * \
 cust_prefix##_node2item(const cust_root_t *root, const gavl_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, gavl_node_t *node)\

diff --git a/ulut/ul_gsa.h b/ulut/ul_gsa.h
index 4454cac5dada2dd31aafbcff7c64f96da0812081..a0cf1e6a6dbe7aa10ac4c35cab01121b2869f7c0 100644 (file)
--- a/ulut/ul_gsa.h
+++ b/ulut/ul_gsa.h
@@ -230,6 +230,7 @@ cust_prefix##_first(const cust_array_t *array)\
 static inline unsigned \
 cust_prefix##_first_indx(const cust_array_t *array)\
 {\
+  (void)array;\
   return 0;\
 }\
 \

diff --git a/ulut/ul_htimmstime.c b/ulut/ul_htimmstime.c
index 327bf50b4c838d2b9156deffb076352b237db107..2cc6bc8276bfb02dda7d1b1e4e7b24b9c27817d3 100644 (file)
--- a/ulut/ul_htimmstime.c
+++ b/ulut/ul_htimmstime.c
@@ -110,22 +110,31 @@ void ul_compute_mstime_next(void)
 
 static int ul_mstime_root_htimer_init(int options, void *context)
 {
+  (void)options;
+  (void)context;
+
   ul_mstime_init();
   return 0;
 }
 
 static ul_htimer_queue_t *ul_mstime_root_htimer_get(int options, void *context)
 {
+  (void)options;
+  (void)context;
+
   return &ul_root_htimer;
 }
 
 static void ul_mstime_root_htimer_put(ul_htimer_queue_t *queue)
 {
+  (void)queue;
 }
 
 static int ul_mstime_root_htimer_current_time(int options, ul_htim_time_t *htimer_time)
 {
   ul_mstime_t mstime;
+  (options);
+
   ul_mstime_now(&mstime);
   ul_mstime2htime(htimer_time, &mstime);
   return 0;

diff --git a/ulut/ul_list.h b/ulut/ul_list.h
index 63287951707e6b0230aec657e011163f6cb33775..b6d12d4f8fba2a7fbe6181d9247b59eebe59592b 100644 (file)
--- a/ulut/ul_list.h
+++ b/ulut/ul_list.h
@@ -17,7 +17,10 @@ typedef struct list_head ul_list_head_t;
 \
 static inline cust_item_t * \
 cust_prefix##_node2item(const cust_head_t *head, const ul_list_node_t *node) \
-  {return UL_CONTAINEROF(node, cust_item_t, cust_node_field);}\
+{\
+  (void)head;\
+  return UL_CONTAINEROF(node, cust_item_t, cust_node_field);\
+}\
 \
 static inline void \
 cust_prefix##_init_head(cust_head_t *head)\
@@ -75,6 +78,7 @@ cust_prefix##_insert(cust_head_t *head, cust_item_t *item)\
 static inline void \
 cust_prefix##_delete(cust_head_t *head, cust_item_t *item)\
 {\
+  (void)head;\
   list_del_init(&item->cust_node_field);\
 }\
 static inline void \

diff --git a/ulut/ul_logbase.c b/ulut/ul_logbase.c
index d3115342f833f305d28a2ac7d6ba10845491340e..70e6d1fc5d2467330a5c8a22d54a864cd6a45600 100644 (file)
--- a/ulut/ul_logbase.c
+++ b/ulut/ul_logbase.c
@@ -137,6 +137,8 @@ ul_vlog1(ul_log_domain_t *domain, int level,
 void
 ul_log_redir(ul_log_fnc_t *log_fnc, int add_flags)
 {
+  (void)add_flags;
+
   if(log_fnc==NULL) log_fnc=ul_log_fnc_default;
   ul_log_output=log_fnc;
 }