Procházet zdrojové kódy

get rid of some warnings

ambrop7 před 13 roky
rodič
revize
93bc612a21

+ 1 - 1
client/DPReceive.c

@@ -83,7 +83,7 @@ static void receiver_recv_handler_send (DPReceiveReceiver *o, uint8_t *packet, i
         BLog(BLOG_WARNING, "wrong number of destinations");
         BLog(BLOG_WARNING, "wrong number of destinations");
         goto out;
         goto out;
     }
     }
-    peerid_t to_id;
+    peerid_t to_id = 0; // to remove warning
     if (num_ids == 1) {
     if (num_ids == 1) {
         if (data_len < sizeof(to_id)) {
         if (data_len < sizeof(to_id)) {
             BLog(BLOG_WARNING, "missing destination");
             BLog(BLOG_WARNING, "missing destination");

+ 1 - 1
client/FragmentProtoAssembler.c

@@ -97,7 +97,7 @@ static struct FragmentProtoAssembler_frame * allocate_new_frame (FragmentProtoAs
     LinkedList1_Append(&o->frames_used, &frame->list_node);
     LinkedList1_Append(&o->frames_used, &frame->list_node);
     // insert to used tree
     // insert to used tree
     int res = FPAFramesTree_Insert(&o->frames_used_tree, 0, frame, NULL);
     int res = FPAFramesTree_Insert(&o->frames_used_tree, 0, frame, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     
     
     return frame;
     return frame;
 }
 }

+ 4 - 4
client/FrameDecider.c

@@ -114,7 +114,7 @@ static void add_mac_to_peer (FrameDeciderPeer *o, uint8_t *mac)
     // add to used
     // add to used
     LinkedList1_Append(&o->mac_entries_used, &entry->list_node);
     LinkedList1_Append(&o->mac_entries_used, &entry->list_node);
     int res = FDMacsTree_Insert(&d->macs_tree, 0, entry, NULL);
     int res = FDMacsTree_Insert(&d->macs_tree, 0, entry, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
 }
 }
 
 
 static uint32_t compute_sig_for_group (uint32_t group)
 static uint32_t compute_sig_for_group (uint32_t group)
@@ -156,7 +156,7 @@ static void add_to_multicast (FrameDecider *d, struct _FrameDecider_group_entry
         
         
         // insert to multicast tree
         // insert to multicast tree
         int res = FDMulticastTree_Insert(&d->multicast_tree, 0, group_entry, NULL);
         int res = FDMulticastTree_Insert(&d->multicast_tree, 0, group_entry, NULL);
-        ASSERT(res)
+        ASSERT_EXECUTE(res)
         
         
         // init list node
         // init list node
         LinkedList3Node_InitLonely(&group_entry->sig_list_node);
         LinkedList3Node_InitLonely(&group_entry->sig_list_node);
@@ -188,7 +188,7 @@ static void remove_from_multicast (FrameDecider *d, struct _FrameDecider_group_e
             
             
             // insert to multicast tree
             // insert to multicast tree
             int res = FDMulticastTree_Insert(&d->multicast_tree, 0, newmaster, NULL);
             int res = FDMulticastTree_Insert(&d->multicast_tree, 0, newmaster, NULL);
-            ASSERT(res)
+            ASSERT_EXECUTE(res)
         }
         }
     }
     }
     
     
@@ -240,7 +240,7 @@ static void add_group_to_peer (FrameDeciderPeer *o, uint32_t group)
         
         
         // insert to peer's groups tree
         // insert to peer's groups tree
         int res = FDGroupsTree_Insert(&o->groups_tree, 0, group_entry, NULL);
         int res = FDGroupsTree_Insert(&o->groups_tree, 0, group_entry, NULL);
-        ASSERT(res)
+        ASSERT_EXECUTE(res)
         
         
         // add to multicast
         // add to multicast
         add_to_multicast(d, group_entry);
         add_to_multicast(d, group_entry);

+ 14 - 14
client/client.c

@@ -1918,10 +1918,10 @@ void peer_chat_handler_message (struct peer_data *peer, uint8_t *data, int data_
     }
     }
     
     
     // read message
     // read message
-    uint16_t type;
+    uint16_t type = 0; // to remove warning
     ASSERT_EXECUTE(msgParser_Gettype(&parser, &type))
     ASSERT_EXECUTE(msgParser_Gettype(&parser, &type))
-    uint8_t *payload;
-    int payload_len;
+    uint8_t *payload = NULL; // to remove warning
+    int payload_len = 0; // to remove warning
     ASSERT_EXECUTE(msgParser_Getpayload(&parser, &payload, &payload_len))
     ASSERT_EXECUTE(msgParser_Getpayload(&parser, &payload, &payload_len))
     
     
     // dispatch according to message type
     // dispatch according to message type
@@ -1979,8 +1979,8 @@ void peer_msg_youconnect (struct peer_data *peer, uint8_t *data, int data_len)
         }
         }
         
         
         // check if the address scope is known
         // check if the address scope is known
-        uint8_t *name_data;
-        int name_len;
+        uint8_t *name_data = NULL; // to remove warning
+        int name_len = 0; // to remove warning
         ASSERT_EXECUTE(msg_youconnect_addrParser_Getname(&aparser, &name_data, &name_len))
         ASSERT_EXECUTE(msg_youconnect_addrParser_Getname(&aparser, &name_data, &name_len))
         char *name;
         char *name;
         if (!(name = address_scope_known(name_data, name_len))) {
         if (!(name = address_scope_known(name_data, name_len))) {
@@ -1988,8 +1988,8 @@ void peer_msg_youconnect (struct peer_data *peer, uint8_t *data, int data_len)
         }
         }
         
         
         // read address
         // read address
-        uint8_t *addr_data;
-        int addr_len;
+        uint8_t *addr_data = NULL; // to remove warning
+        int addr_len = 0; // to remove warning
         ASSERT_EXECUTE(msg_youconnect_addrParser_Getaddr(&aparser, &addr_data, &addr_len))
         ASSERT_EXECUTE(msg_youconnect_addrParser_Getaddr(&aparser, &addr_data, &addr_len))
         if (!addr_read(addr_data, addr_len, &addr)) {
         if (!addr_read(addr_data, addr_len, &addr)) {
             peer_log(peer, BLOG_WARNING, "msg_youconnect: failed to read address");
             peer_log(peer, BLOG_WARNING, "msg_youconnect: failed to read address");
@@ -2082,13 +2082,13 @@ void peer_msg_seed (struct peer_data *peer, uint8_t *data, int data_len)
     }
     }
     
     
     // read message
     // read message
-    uint16_t seed_id;
+    uint16_t seed_id = 0; // to remove warning
     ASSERT_EXECUTE(msg_seedParser_Getseed_id(&parser, &seed_id))
     ASSERT_EXECUTE(msg_seedParser_Getseed_id(&parser, &seed_id))
-    uint8_t *key;
-    int key_len;
+    uint8_t *key = NULL; // to remove warning
+    int key_len = 0; // to remove warning
     ASSERT_EXECUTE(msg_seedParser_Getkey(&parser, &key, &key_len))
     ASSERT_EXECUTE(msg_seedParser_Getkey(&parser, &key, &key_len))
-    uint8_t *iv;
-    int iv_len;
+    uint8_t *iv = NULL; // to remove warning
+    int iv_len = 0; // to remove warning
     ASSERT_EXECUTE(msg_seedParser_Getiv(&parser, &iv, &iv_len))
     ASSERT_EXECUTE(msg_seedParser_Getiv(&parser, &iv, &iv_len))
     
     
     if (options.transport_mode != TRANSPORT_MODE_UDP) {
     if (options.transport_mode != TRANSPORT_MODE_UDP) {
@@ -2134,7 +2134,7 @@ void peer_msg_confirmseed (struct peer_data *peer, uint8_t *data, int data_len)
     }
     }
     
     
     // read message
     // read message
-    uint16_t seed_id;
+    uint16_t seed_id = 0; // to remove warning
     ASSERT_EXECUTE(msg_confirmseedParser_Getseed_id(&parser, &seed_id))
     ASSERT_EXECUTE(msg_confirmseedParser_Getseed_id(&parser, &seed_id))
     
     
     if (options.transport_mode != TRANSPORT_MODE_UDP) {
     if (options.transport_mode != TRANSPORT_MODE_UDP) {
@@ -2468,7 +2468,7 @@ void peer_send_conectinfo (struct peer_data *peer, int addr_index, int port_adju
     struct bind_addr *bind_addr = &bind_addrs[addr_index];
     struct bind_addr *bind_addr = &bind_addrs[addr_index];
     
     
     // remember encryption key size
     // remember encryption key size
-    int key_size;
+    int key_size = 0; // to remove warning
     if (options.transport_mode == TRANSPORT_MODE_UDP && SPPROTO_HAVE_ENCRYPTION(sp_params)) {
     if (options.transport_mode == TRANSPORT_MODE_UDP && SPPROTO_HAVE_ENCRYPTION(sp_params)) {
         key_size = BEncryption_cipher_key_size(sp_params.encryption_mode);
         key_size = BEncryption_cipher_key_size(sp_params.encryption_mode);
     }
     }

+ 4 - 4
dhcpclient/BDHCPClientCore.c

@@ -229,16 +229,16 @@ static void recv_handler_done (BDHCPClientCore *o, int data_len)
     int dhcp_message_type = -1;
     int dhcp_message_type = -1;
     
     
     int have_dhcp_server_identifier = 0;
     int have_dhcp_server_identifier = 0;
-    uint32_t dhcp_server_identifier;
+    uint32_t dhcp_server_identifier = 0; // to remove warning
     
     
     int have_ip_address_lease_time = 0;
     int have_ip_address_lease_time = 0;
-    uint32_t ip_address_lease_time;
+    uint32_t ip_address_lease_time = 0; // to remove warning
     
     
     int have_subnet_mask = 0;
     int have_subnet_mask = 0;
-    uint32_t subnet_mask;
+    uint32_t subnet_mask = 0; // to remove warning
     
     
     int have_router = 0;
     int have_router = 0;
-    uint32_t router;
+    uint32_t router = 0; // to remove warning
     
     
     int domain_name_servers_count = 0;
     int domain_name_servers_count = 0;
     uint32_t domain_name_servers[BDHCPCLIENTCORE_MAX_DOMAIN_NAME_SERVERS];
     uint32_t domain_name_servers[BDHCPCLIENTCORE_MAX_DOMAIN_NAME_SERVERS];

+ 3 - 1
examples/RandomPacketSink.h

@@ -32,6 +32,7 @@
 
 
 #include <stdio.h>
 #include <stdio.h>
 
 
+#include <misc/debug.h>
 #include <security/BRandom.h>
 #include <security/BRandom.h>
 #include <system/BReactor.h>
 #include <system/BReactor.h>
 #include <base/DebugObject.h>
 #include <base/DebugObject.h>
@@ -49,7 +50,8 @@ static void _RandomPacketSink_input_handler_send (RandomPacketSink *s, uint8_t *
     DebugObject_Access(&s->d_obj);
     DebugObject_Access(&s->d_obj);
     
     
     printf("sink: send '");
     printf("sink: send '");
-    fwrite(data, data_len, 1, stdout);
+    size_t res = fwrite(data, data_len, 1, stdout);
+    B_USE(res)
     
     
     uint8_t r;
     uint8_t r;
     BRandom_randomize(&r, sizeof(r));
     BRandom_randomize(&r, sizeof(r));

+ 3 - 1
examples/TimerPacketSink.h

@@ -32,6 +32,7 @@
 
 
 #include <stdio.h>
 #include <stdio.h>
 
 
+#include <misc/debug.h>
 #include <system/BReactor.h>
 #include <system/BReactor.h>
 #include <flow/PacketPassInterface.h>
 #include <flow/PacketPassInterface.h>
 
 
@@ -44,7 +45,8 @@ typedef struct {
 static void _TimerPacketSink_input_handler_send (TimerPacketSink *s, uint8_t *data, int data_len)
 static void _TimerPacketSink_input_handler_send (TimerPacketSink *s, uint8_t *data, int data_len)
 {
 {
     printf("sink: send '");
     printf("sink: send '");
-    fwrite(data, data_len, 1, stdout);
+    size_t res = fwrite(data, data_len, 1, stdout);
+    B_USE(res)
     printf("'\n");
     printf("'\n");
     
     
     BReactor_SetTimer(s->reactor, &s->timer);
     BReactor_SetTimer(s->reactor, &s->timer);

+ 4 - 2
flow/PacketPassFairQueue.c

@@ -55,7 +55,7 @@ static uint64_t get_current_time (PacketPassFairQueue *m)
         return m->sending_flow->time;
         return m->sending_flow->time;
     }
     }
     
     
-    uint64_t time;
+    uint64_t time = 0; // to remove warning
     int have = 0;
     int have = 0;
     
     
     PacketPassFairQueueFlow *first_flow = PacketPassFairQueue__Tree_GetFirst(&m->queued_tree, 0);
     PacketPassFairQueueFlow *first_flow = PacketPassFairQueue__Tree_GetFirst(&m->queued_tree, 0);
@@ -171,7 +171,7 @@ static void input_handler_send (PacketPassFairQueueFlow *flow, uint8_t *data, in
     flow->queued.data = data;
     flow->queued.data = data;
     flow->queued.data_len = data_len;
     flow->queued.data_len = data_len;
     int res = PacketPassFairQueue__Tree_Insert(&m->queued_tree, 0, flow, NULL);
     int res = PacketPassFairQueue__Tree_Insert(&m->queued_tree, 0, flow, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     flow->is_queued = 1;
     flow->is_queued = 1;
     
     
     if (!m->sending_flow && !BPending_IsSet(&m->schedule_job)) {
     if (!m->sending_flow && !BPending_IsSet(&m->schedule_job)) {
@@ -353,6 +353,7 @@ void PacketPassFairQueueFlow_Free (PacketPassFairQueueFlow *flow)
 void PacketPassFairQueueFlow_AssertFree (PacketPassFairQueueFlow *flow)
 void PacketPassFairQueueFlow_AssertFree (PacketPassFairQueueFlow *flow)
 {
 {
     PacketPassFairQueue *m = flow->m;
     PacketPassFairQueue *m = flow->m;
+    B_USE(m)
     
     
     ASSERT(m->freeing || flow != m->sending_flow)
     ASSERT(m->freeing || flow != m->sending_flow)
     DebugObject_Access(&flow->d_obj);
     DebugObject_Access(&flow->d_obj);
@@ -385,6 +386,7 @@ void PacketPassFairQueueFlow_RequestCancel (PacketPassFairQueueFlow *flow)
 void PacketPassFairQueueFlow_SetBusyHandler (PacketPassFairQueueFlow *flow, PacketPassFairQueue_handler_busy handler, void *user)
 void PacketPassFairQueueFlow_SetBusyHandler (PacketPassFairQueueFlow *flow, PacketPassFairQueue_handler_busy handler, void *user)
 {
 {
     PacketPassFairQueue *m = flow->m;
     PacketPassFairQueue *m = flow->m;
+    B_USE(m)
     
     
     ASSERT(flow == m->sending_flow)
     ASSERT(flow == m->sending_flow)
     ASSERT(!m->freeing)
     ASSERT(!m->freeing)

+ 2 - 0
flow/PacketPassFifoQueue.c

@@ -206,6 +206,7 @@ void PacketPassFifoQueueFlow_Free (PacketPassFifoQueueFlow *o)
 void PacketPassFifoQueueFlow_AssertFree (PacketPassFifoQueueFlow *o)
 void PacketPassFifoQueueFlow_AssertFree (PacketPassFifoQueueFlow *o)
 {
 {
     PacketPassFifoQueue *queue = o->queue;
     PacketPassFifoQueue *queue = o->queue;
+    B_USE(queue)
     DebugObject_Access(&o->d_obj);
     DebugObject_Access(&o->d_obj);
     ASSERT(queue->freeing || o != queue->sending_flow)
     ASSERT(queue->freeing || o != queue->sending_flow)
 }
 }
@@ -222,6 +223,7 @@ int PacketPassFifoQueueFlow_IsBusy (PacketPassFifoQueueFlow *o)
 void PacketPassFifoQueueFlow_SetBusyHandler (PacketPassFifoQueueFlow *o, PacketPassFifoQueue_handler_busy handler_busy, void *user)
 void PacketPassFifoQueueFlow_SetBusyHandler (PacketPassFifoQueueFlow *o, PacketPassFifoQueue_handler_busy handler_busy, void *user)
 {
 {
     PacketPassFifoQueue *queue = o->queue;
     PacketPassFifoQueue *queue = o->queue;
+    B_USE(queue)
     DebugObject_Access(&o->d_obj);
     DebugObject_Access(&o->d_obj);
     ASSERT(!queue->freeing)
     ASSERT(!queue->freeing)
     ASSERT(o == queue->sending_flow)
     ASSERT(o == queue->sending_flow)

+ 3 - 1
flow/PacketPassPriorityQueue.c

@@ -91,7 +91,7 @@ static void input_handler_send (PacketPassPriorityQueueFlow *flow, uint8_t *data
     flow->queued.data = data;
     flow->queued.data = data;
     flow->queued.data_len = data_len;
     flow->queued.data_len = data_len;
     int res = PacketPassPriorityQueue__Tree_Insert(&m->queued_tree, 0, flow, NULL);
     int res = PacketPassPriorityQueue__Tree_Insert(&m->queued_tree, 0, flow, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     flow->is_queued = 1;
     flow->is_queued = 1;
     
     
     if (!m->sending_flow && !BPending_IsSet(&m->schedule_job)) {
     if (!m->sending_flow && !BPending_IsSet(&m->schedule_job)) {
@@ -231,6 +231,7 @@ void PacketPassPriorityQueueFlow_Free (PacketPassPriorityQueueFlow *flow)
 void PacketPassPriorityQueueFlow_AssertFree (PacketPassPriorityQueueFlow *flow)
 void PacketPassPriorityQueueFlow_AssertFree (PacketPassPriorityQueueFlow *flow)
 {
 {
     PacketPassPriorityQueue *m = flow->m;
     PacketPassPriorityQueue *m = flow->m;
+    B_USE(m)
     
     
     ASSERT(m->freeing || flow != m->sending_flow)
     ASSERT(m->freeing || flow != m->sending_flow)
     DebugObject_Access(&flow->d_obj);
     DebugObject_Access(&flow->d_obj);
@@ -263,6 +264,7 @@ void PacketPassPriorityQueueFlow_RequestCancel (PacketPassPriorityQueueFlow *flo
 void PacketPassPriorityQueueFlow_SetBusyHandler (PacketPassPriorityQueueFlow *flow, PacketPassPriorityQueue_handler_busy handler, void *user)
 void PacketPassPriorityQueueFlow_SetBusyHandler (PacketPassPriorityQueueFlow *flow, PacketPassPriorityQueue_handler_busy handler, void *user)
 {
 {
     PacketPassPriorityQueue *m = flow->m;
     PacketPassPriorityQueue *m = flow->m;
+    B_USE(m)
     
     
     ASSERT(flow == m->sending_flow)
     ASSERT(flow == m->sending_flow)
     ASSERT(!m->freeing)
     ASSERT(!m->freeing)

+ 1 - 1
ncd/NCDInterpProcess.c

@@ -118,7 +118,7 @@ static int convert_value_recurser (NCDPlaceholderDb *pdb, NCDValue *value, NCDVa
                 }
                 }
                 
                 
                 int res = NCDVal_MapInsert(*out, vkey, vval);
                 int res = NCDVal_MapInsert(*out, vkey, vval);
-                ASSERT(res) // we assume different variables get different placeholder ids
+                ASSERT_EXECUTE(res) // we assume different variables get different placeholder ids
             }
             }
         } break;
         } break;
         
         

+ 1 - 1
ncd/NCDMethodIndex.c

@@ -109,7 +109,7 @@ static int add_method_name (NCDMethodIndex *o, const char *method_name, int *out
     
     
     NCDMethodIndex__HashRef ref = {name_entry, o->num_names};
     NCDMethodIndex__HashRef ref = {name_entry, o->num_names};
     int res = NCDMethodIndex__Hash_Insert(&o->hash, o->names, ref, NULL);
     int res = NCDMethodIndex__Hash_Insert(&o->hash, o->names, ref, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     
     
     o->num_entries++;
     o->num_entries++;
     o->num_names++;
     o->num_names++;

+ 1 - 1
ncd/NCDModuleIndex.c

@@ -185,7 +185,7 @@ int NCDModuleIndex_AddGroup (NCDModuleIndex *o, const struct NCDModuleGroup *gro
         
         
         NCDModuleIndex__MHashRef ref = {m, o->num_modules};
         NCDModuleIndex__MHashRef ref = {m, o->num_modules};
         int res = NCDModuleIndex__MHash_Insert(&o->modules_hash, o->modules, ref, NULL);
         int res = NCDModuleIndex__MHash_Insert(&o->modules_hash, o->modules, ref, NULL);
-        ASSERT(res)
+        ASSERT_EXECUTE(res)
         
         
         const char *base_type = (nm->base_type ? nm->base_type : nm->type);
         const char *base_type = (nm->base_type ? nm->base_type : nm->type);
         
         

+ 1 - 1
ncd/NCDRequestClient.c

@@ -583,7 +583,7 @@ int NCDRequestClientRequest_Init (NCDRequestClientRequest *o, NCDRequestClient *
     
     
     // insert to reqs tree
     // insert to reqs tree
     int res = BAVL_Insert(&client->reqs_tree, &req->reqs_tree_node, NULL);
     int res = BAVL_Insert(&client->reqs_tree, &req->reqs_tree_node, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     
     
     // set pointers
     // set pointers
     o->req = req;
     o->req = req;

+ 3 - 1
ncd/NCDVal.c

@@ -117,9 +117,11 @@ static void NCDVal__AssertMem (NCDValMem *mem)
 
 
 static void NCDVal_AssertExternal (NCDValMem *mem, const void *e_buf, size_t e_len)
 static void NCDVal_AssertExternal (NCDValMem *mem, const void *e_buf, size_t e_len)
 {
 {
+#ifndef NDEBUG
     const char *e_cbuf = e_buf;
     const char *e_cbuf = e_buf;
     char *buf = (mem->buf ? mem->buf : mem->fastbuf);
     char *buf = (mem->buf ? mem->buf : mem->fastbuf);
     ASSERT(e_cbuf >= buf + mem->size || e_cbuf + e_len <= buf)
     ASSERT(e_cbuf >= buf + mem->size || e_cbuf + e_len <= buf)
+#endif
 }
 }
 
 
 static void NCDVal__AssertValOnly (NCDValMem *mem, NCDVal__idx idx)
 static void NCDVal__AssertValOnly (NCDValMem *mem, NCDVal__idx idx)
@@ -378,7 +380,7 @@ NCDValRef NCDVal_NewCopy (NCDValMem *mem, NCDValRef val)
                 }
                 }
                 
                 
                 int res = NCDVal_MapInsert(copy, key_copy, val_copy);
                 int res = NCDVal_MapInsert(copy, key_copy, val_copy);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             }
             }
             
             
             return copy;
             return copy;

+ 1 - 1
ncd/NCDValCompat.c

@@ -75,7 +75,7 @@ int NCDValCompat_ValueToVal (NCDValue *value, NCDValMem *mem, NCDValRef *out)
                 }
                 }
                 
                 
                 int res = NCDVal_MapInsert(*out, vkey, vval);
                 int res = NCDVal_MapInsert(*out, vkey, vval);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             }
             }
         } break;
         } break;
         
         

+ 1 - 1
ncd/NCDValue.c

@@ -589,7 +589,7 @@ NCDValue * NCDValue_MapInsert (NCDValue *o, NCDValue key, NCDValue val)
     e->key = key;
     e->key = key;
     e->val = val;
     e->val = val;
     int res = NCDValue__MapTree_Insert(&o->map_tree, 0, e, NULL);
     int res = NCDValue__MapTree_Insert(&o->map_tree, 0, e, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     
     
     o->map_count++;
     o->map_count++;
     
     

+ 3 - 2
ncd/modules/net_ipv4_route.c

@@ -45,6 +45,7 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 
 
+#include <misc/debug.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
 #include <ncd/NCDIfConfig.h>
 
 
@@ -129,7 +130,7 @@ static void func_new (void *vo, NCDModuleInst *i)
     o->ifname = NCDVal_StringValue(ifname_arg);
     o->ifname = NCDVal_StringValue(ifname_arg);
     
     
     // add route
     // add route
-    int res;
+    int res = 0; // to remove warning
     switch (o->type) {
     switch (o->type) {
         case TYPE_NORMAL:
         case TYPE_NORMAL:
             res = NCDIfConfig_add_ipv4_route(o->dest, &o->gateway, o->metric, o->ifname);
             res = NCDIfConfig_add_ipv4_route(o->dest, &o->gateway, o->metric, o->ifname);
@@ -161,7 +162,7 @@ static void func_die (void *vo)
     struct instance *o = vo;
     struct instance *o = vo;
     
     
     // remove route
     // remove route
-    int res;
+    int res = 0; // to remove warning
     switch (o->type) {
     switch (o->type) {
         case TYPE_NORMAL:
         case TYPE_NORMAL:
             res = NCDIfConfig_remove_ipv4_route(o->dest, &o->gateway, o->metric, o->ifname);
             res = NCDIfConfig_remove_ipv4_route(o->dest, &o->gateway, o->metric, o->ifname);

+ 2 - 2
ncd/modules/net_ipv6_route.c

@@ -132,7 +132,7 @@ static void func_new (void *vo, NCDModuleInst *i)
     o->ifname = NCDVal_StringValue(ifname_arg);
     o->ifname = NCDVal_StringValue(ifname_arg);
     
     
     // add route
     // add route
-    int res;
+    int res = 0; // to remove warning
     switch (o->type) {
     switch (o->type) {
         case TYPE_NORMAL:
         case TYPE_NORMAL:
             res = NCDIfConfig_add_ipv6_route(o->dest, &o->gateway, o->metric, o->ifname);
             res = NCDIfConfig_add_ipv6_route(o->dest, &o->gateway, o->metric, o->ifname);
@@ -164,7 +164,7 @@ static void func_die (void *vo)
     struct instance *o = vo;
     struct instance *o = vo;
     
     
     // remove route
     // remove route
-    int res;
+    int res = 0; // to remove warning
     switch (o->type) {
     switch (o->type) {
         case TYPE_NORMAL:
         case TYPE_NORMAL:
             res = NCDIfConfig_remove_ipv6_route(o->dest, &o->gateway, o->metric, o->ifname);
             res = NCDIfConfig_remove_ipv6_route(o->dest, &o->gateway, o->metric, o->ifname);

+ 2 - 0
ncd/modules/process_manager.c

@@ -50,6 +50,7 @@
 #include <string.h>
 #include <string.h>
 
 
 #include <misc/offset.h>
 #include <misc/offset.h>
+#include <misc/debug.h>
 #include <structure/LinkedList1.h>
 #include <structure/LinkedList1.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDModule.h>
 
 
@@ -203,6 +204,7 @@ void process_free (struct process *p)
 void process_retry_timer_handler (struct process *p)
 void process_retry_timer_handler (struct process *p)
 {
 {
     struct instance *o = p->manager;
     struct instance *o = p->manager;
+    B_USE(o)
     ASSERT(p->state == PROCESS_STATE_RETRYING)
     ASSERT(p->state == PROCESS_STATE_RETRYING)
     ASSERT(!o->dying)
     ASSERT(!o->dying)
     ASSERT(p->have_params)
     ASSERT(p->have_params)

+ 13 - 11
ncd/modules/value.c

@@ -489,7 +489,7 @@ static int value_map_insert (struct value *map, struct value *v, NCDValMem mem,
     v->map_parent.key_mem = mem;
     v->map_parent.key_mem = mem;
     v->map_parent.key = NCDVal_FromSafe(&v->map_parent.key_mem, key);
     v->map_parent.key = NCDVal_FromSafe(&v->map_parent.key_mem, key);
     int res = MapTree_Insert(&map->map.map_tree, 0, v, NULL);
     int res = MapTree_Insert(&map->map.map_tree, 0, v, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
     v->parent = map;
     v->parent = map;
     
     
     return 1;
     return 1;
@@ -584,7 +584,9 @@ static struct value * value_init_fromvalue (NCDModuleInst *i, NCDValRef value)
             }
             }
         } break;
         } break;
         
         
-        default: ASSERT(0);
+        default:
+            ASSERT(0);
+            return NULL;
     }
     }
     
     
     return v;
     return v;
@@ -648,7 +650,7 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
                 }
                 }
                 
                 
                 int res = NCDVal_MapInsert(*out_value, key, val);
                 int res = NCDVal_MapInsert(*out_value, key, val);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             }
             }
         } break;
         } break;
         
         
@@ -759,7 +761,7 @@ static struct value * value_insert (NCDModuleInst *i, struct value *v, NCDValRef
                 value_list_remove(v, oldv);
                 value_list_remove(v, oldv);
                 
                 
                 int res = value_list_insert(i, v, nv, index);
                 int res = value_list_insert(i, v, nv, index);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             } else {
             } else {
                 if (!value_list_insert(i, v, nv, index)) {
                 if (!value_list_insert(i, v, nv, index)) {
                     goto fail1;
                     goto fail1;
@@ -790,7 +792,7 @@ static struct value * value_insert (NCDModuleInst *i, struct value *v, NCDValRef
             }
             }
             
             
             int res = value_map_insert(v, nv, key_mem, NCDVal_ToSafe(key), i);
             int res = value_map_insert(v, nv, key_mem, NCDVal_ToSafe(key), i);
-            ASSERT(res)
+            ASSERT_EXECUTE(res)
         } break;
         } break;
         
         
         default: ASSERT(0);
         default: ASSERT(0);
@@ -1184,7 +1186,7 @@ static void undo_deinit_func (struct insert_undo_deinit_data *data, NCDModuleIns
                 value_list_remove(parent, val);
                 value_list_remove(parent, val);
                 if (oldval) {
                 if (oldval) {
                     int res = value_list_insert(i, parent, oldval, index);
                     int res = value_list_insert(i, parent, oldval, index);
-                    ASSERT(res)
+                    ASSERT_EXECUTE(res)
                 }
                 }
             } break;
             } break;
             
             
@@ -1194,7 +1196,7 @@ static void undo_deinit_func (struct insert_undo_deinit_data *data, NCDModuleIns
                 value_map_remove2(parent, val, &key_mem, &key);
                 value_map_remove2(parent, val, &key_mem, &key);
                 if (oldval) {
                 if (oldval) {
                     int res = value_map_insert(parent, oldval, key_mem, key, i);
                     int res = value_map_insert(parent, oldval, key_mem, key, i);
-                    ASSERT(res)
+                    ASSERT_EXECUTE(res)
                 } else {
                 } else {
                     NCDValMem_Free(&key_mem);
                     NCDValMem_Free(&key_mem);
                 }
                 }
@@ -1290,7 +1292,7 @@ static void func_new_replace_this (void *vo, NCDModuleInst *i)
                 size_t index = value_list_indexof(parent, mov);
                 size_t index = value_list_indexof(parent, mov);
                 value_list_remove(parent, mov);
                 value_list_remove(parent, mov);
                 int res = value_list_insert(i, parent, v, index);
                 int res = value_list_insert(i, parent, v, index);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             } break;
             } break;
             
             
             case NCDVAL_MAP: {
             case NCDVAL_MAP: {
@@ -1298,7 +1300,7 @@ static void func_new_replace_this (void *vo, NCDModuleInst *i)
                 NCDValSafeRef key;
                 NCDValSafeRef key;
                 value_map_remove2(parent, mov, &key_mem, &key);
                 value_map_remove2(parent, mov, &key_mem, &key);
                 int res = value_map_insert(parent, v, key_mem, key, i);
                 int res = value_map_insert(parent, v, key_mem, key, i);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             } break;
             } break;
             
             
             default: ASSERT(0);
             default: ASSERT(0);
@@ -1353,7 +1355,7 @@ static void func_new_replace_this_undo (void *vo, NCDModuleInst *i)
                 size_t index = value_list_indexof(parent, mov);
                 size_t index = value_list_indexof(parent, mov);
                 value_list_remove(parent, mov);
                 value_list_remove(parent, mov);
                 int res = value_list_insert(i, parent, v, index);
                 int res = value_list_insert(i, parent, v, index);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             } break;
             } break;
             
             
             case NCDVAL_MAP: {
             case NCDVAL_MAP: {
@@ -1361,7 +1363,7 @@ static void func_new_replace_this_undo (void *vo, NCDModuleInst *i)
                 NCDValSafeRef key;
                 NCDValSafeRef key;
                 value_map_remove2(parent, mov, &key_mem, &key);
                 value_map_remove2(parent, mov, &key_mem, &key);
                 int res = value_map_insert(parent, v, key_mem, key, i);
                 int res = value_map_insert(parent, v, key_mem, key, i);
-                ASSERT(res)
+                ASSERT_EXECUTE(res)
             } break;
             } break;
             
             
             default: ASSERT(0);
             default: ASSERT(0);

+ 2 - 1
protocol/addr.h

@@ -145,6 +145,7 @@ void addr_write (uint8_t *out, BAddr addr)
     }
     }
     
     
     int len = addrWriter_Finish(&writer);
     int len = addrWriter_Finish(&writer);
+    B_USE(len)
     
     
     ASSERT(len == addr_size(addr))
     ASSERT(len == addr_size(addr))
 }
 }
@@ -159,7 +160,7 @@ int addr_read (uint8_t *data, int data_len, BAddr *out_addr)
         return 0;
         return 0;
     }
     }
     
     
-    uint8_t type;
+    uint8_t type = 0; // to remove warning
     addrParser_Gettype(&parser, &type);
     addrParser_Gettype(&parser, &type);
     
     
     switch (type) {
     switch (type) {

+ 2 - 2
security/BEncryption.c

@@ -132,11 +132,11 @@ fail1:
         case BENCRYPTION_CIPHER_AES:
         case BENCRYPTION_CIPHER_AES:
             if (enc->mode&BENCRYPTION_MODE_ENCRYPT) {
             if (enc->mode&BENCRYPTION_MODE_ENCRYPT) {
                 res = AES_set_encrypt_key(key, 128, &enc->aes.encrypt);
                 res = AES_set_encrypt_key(key, 128, &enc->aes.encrypt);
-                ASSERT(res >= 0)
+                ASSERT_EXECUTE(res >= 0)
             }
             }
             if (enc->mode&BENCRYPTION_MODE_DECRYPT) {
             if (enc->mode&BENCRYPTION_MODE_DECRYPT) {
                 res = AES_set_decrypt_key(key, 128, &enc->aes.decrypt);
                 res = AES_set_decrypt_key(key, 128, &enc->aes.decrypt);
-                ASSERT(res >= 0)
+                ASSERT_EXECUTE(res >= 0)
             }
             }
             break;
             break;
         default:
         default:

+ 6 - 0
structure/ChunkBuffer2.h

@@ -87,6 +87,8 @@ static int _ChunkBuffer2_end (ChunkBuffer2 *buf)
     }
     }
 }
 }
 
 
+#ifndef NDEBUG
+
 static void _ChunkBuffer2_assert_buffer (ChunkBuffer2 *buf)
 static void _ChunkBuffer2_assert_buffer (ChunkBuffer2 *buf)
 {
 {
     ASSERT(buf->size > 0)
     ASSERT(buf->size > 0)
@@ -147,6 +149,8 @@ static void _ChunkBuffer2_assert_io (ChunkBuffer2 *buf)
     }
     }
 }
 }
 
 
+#endif
+
 static void _ChunkBuffer2_update_input (ChunkBuffer2 *buf)
 static void _ChunkBuffer2_update_input (ChunkBuffer2 *buf)
 {
 {
     int end = _ChunkBuffer2_end(buf);
     int end = _ChunkBuffer2_end(buf);
@@ -183,9 +187,11 @@ static void _ChunkBuffer2_update_output (ChunkBuffer2 *buf)
     if (buf->used > 0) {
     if (buf->used > 0) {
         int datalen = buf->buffer[buf->start].len;
         int datalen = buf->buffer[buf->start].len;
         ASSERT(datalen >= 0)
         ASSERT(datalen >= 0)
+#ifndef NDEBUG
         int blocklen = bdivide_up(datalen, sizeof(struct ChunkBuffer2_block));
         int blocklen = bdivide_up(datalen, sizeof(struct ChunkBuffer2_block));
         ASSERT(blocklen <= buf->used - 1)
         ASSERT(blocklen <= buf->used - 1)
         ASSERT(blocklen <= buf->wrap - buf->start - 1)
         ASSERT(blocklen <= buf->wrap - buf->start - 1)
+#endif
         buf->output_dest = (uint8_t *)&buf->buffer[buf->start + 1];
         buf->output_dest = (uint8_t *)&buf->buffer[buf->start + 1];
         buf->output_avail = datalen;
         buf->output_avail = datalen;
     } else {
     } else {

+ 2 - 0
structure/IndexedList.h

@@ -38,6 +38,7 @@
 #include <stdint.h>
 #include <stdint.h>
 
 
 #include <misc/offset.h>
 #include <misc/offset.h>
+#include <misc/debug.h>
 #include <structure/CAvl.h>
 #include <structure/CAvl.h>
 
 
 typedef struct IndexedList_s IndexedList;
 typedef struct IndexedList_s IndexedList;
@@ -164,6 +165,7 @@ static void IndexedList_InsertAt (IndexedList *o, IndexedListNode *node, uint64_
     ASSERT(IndexedList__Tree_Count(&o->tree, 0) < UINT64_MAX - 1)
     ASSERT(IndexedList__Tree_Count(&o->tree, 0) < UINT64_MAX - 1)
     
     
     uint64_t orig_count = IndexedList__Tree_Count(&o->tree, 0);
     uint64_t orig_count = IndexedList__Tree_Count(&o->tree, 0);
+    B_USE(orig_count)
     
     
     IndexedList__Tree_InsertAt(&o->tree, 0, IndexedList__TreeDeref(0, node), index);
     IndexedList__Tree_InsertAt(&o->tree, 0, IndexedList__TreeDeref(0, node), index);
     
     

+ 1 - 1
structure/LinkedList3.h

@@ -338,7 +338,7 @@ LinkedList3Node * LinkedList3Iterator_Next (LinkedList3Iterator *it)
     // jump to next entry
     // jump to next entry
     if (it->e) {
     if (it->e) {
         // get next entry
         // get next entry
-        LinkedList3Node *next;
+        LinkedList3Node *next = NULL; // to remove warning
         switch (it->dir) {
         switch (it->dir) {
             case 1:
             case 1:
                 next = it->e->n;
                 next = it->e->n;

+ 4 - 4
system/BReactor_badvpn.c

@@ -295,7 +295,7 @@ static void wait_for_events (BReactor *bsys)
     // timeout vars
     // timeout vars
     int have_timeout = 0;
     int have_timeout = 0;
     btime_t timeout_abs;
     btime_t timeout_abs;
-    btime_t now;
+    btime_t now = 0; // to remove warning
     
     
     // compute timeout
     // compute timeout
     BTimer *first_timer = BReactor__TimersTree_GetFirst(&bsys->timers_tree, 0);
     BTimer *first_timer = BReactor__TimersTree_GetFirst(&bsys->timers_tree, 0);
@@ -317,8 +317,8 @@ static void wait_for_events (BReactor *bsys)
     // wait until the timeout is reached or the file descriptor / handle in ready
     // wait until the timeout is reached or the file descriptor / handle in ready
     while (1) {
     while (1) {
         // compute timeout
         // compute timeout
-        btime_t timeout_rel;
-        btime_t timeout_rel_trunc;
+        btime_t timeout_rel = 0; // to remove warning
+        btime_t timeout_rel_trunc = 0; // to remove warning
         if (have_timeout) {
         if (have_timeout) {
             timeout_rel = timeout_abs - now;
             timeout_rel = timeout_abs - now;
             timeout_rel_trunc = timeout_rel;
             timeout_rel_trunc = timeout_rel;
@@ -980,7 +980,7 @@ void BReactor_SetTimerAbsolute (BReactor *bsys, BTimer *bt, btime_t time)
 
 
     // insert to running timers tree
     // insert to running timers tree
     int res = BReactor__TimersTree_Insert(&bsys->timers_tree, 0, bt, NULL);
     int res = BReactor__TimersTree_Insert(&bsys->timers_tree, 0, bt, NULL);
-    ASSERT(res)
+    ASSERT_EXECUTE(res)
 }
 }
 
 
 void BReactor_RemoveTimer (BReactor *bsys, BTimer *bt)
 void BReactor_RemoveTimer (BReactor *bsys, BTimer *bt)

+ 1 - 1
tests/bproto_test.c

@@ -35,7 +35,7 @@ int main ()
     uint8_t *g_dst = msg1Writer_Addg(&writer);
     uint8_t *g_dst = msg1Writer_Addg(&writer);
     memcpy(g_dst, g, strlen(g));
     memcpy(g_dst, g, strlen(g));
     int len2 = msg1Writer_Finish(&writer);
     int len2 = msg1Writer_Finish(&writer);
-    ASSERT(len2 == len)
+    ASSERT_EXECUTE(len2 == len)
     
     
     // parse message
     // parse message
     
     

+ 1 - 1
udevmonitor/NCDUdevMonitor.c

@@ -129,7 +129,7 @@ int NCDUdevMonitor_Init (NCDUdevMonitor *o, BReactor *reactor, BProcessManager *
     const char *argv_info[] = {stdbuf_exec, "-o", "L", udevadm_exec, "info", "--query", "all", "--export-db", NULL};
     const char *argv_info[] = {stdbuf_exec, "-o", "L", udevadm_exec, "info", "--query", "all", "--export-db", NULL};
     
     
     // choose arguments based on mode
     // choose arguments based on mode
-    const char **argv;
+    const char **argv = NULL; // to remove warning
     switch (mode) {
     switch (mode) {
         case NCDUDEVMONITOR_MODE_MONITOR_UDEV:   argv = argv_monitor_udev; break;
         case NCDUDEVMONITOR_MODE_MONITOR_UDEV:   argv = argv_monitor_udev; break;
         case NCDUDEVMONITOR_MODE_INFO:           argv = argv_info; break;
         case NCDUDEVMONITOR_MODE_INFO:           argv = argv_info; break;

+ 1 - 0
udpgw_client/UdpGwClient.c

@@ -323,6 +323,7 @@ static void connection_first_job_handler (struct UdpGwClient_connection *con)
 static void connection_send (struct UdpGwClient_connection *con, uint8_t flags, const uint8_t *data, int data_len)
 static void connection_send (struct UdpGwClient_connection *con, uint8_t flags, const uint8_t *data, int data_len)
 {
 {
     UdpGwClient *o = con->client;
     UdpGwClient *o = con->client;
+    B_USE(o)
     ASSERT(data_len >= 0)
     ASSERT(data_len >= 0)
     ASSERT(data_len <= o->udp_mtu)
     ASSERT(data_len <= o->udp_mtu)