Merge pull request #238 from mehlis/debug-guard

Debug: guard some code

core/clist.c

@@ -54,6 +54,8 @@ void clist_remove(clist_node_t **list, clist_node_t *node)
     }
 }
 
+#if ENABLE_DEBUG
+
 void clist_print(clist_node_t *clist)
 {
     clist_node_t *start = clist;
@@ -68,6 +70,8 @@ void clist_print(clist_node_t *clist)
     }
 }
 
+#endif
+
 /*
 int main (int argc, char* argv[]) {
     clist_node_t a;

core/include/clist.h

@@ -39,8 +39,9 @@ static inline void clist_advance(clist_node_t **list)
     *list = (*list)->next;
 }
 
-
+#if ENABLE_DEBUG
 void clist_print(clist_node_t *clist);
+#endif
 
 /**
  * @}

core/include/queue.h

@@ -26,8 +26,10 @@ void queue_priority_add(queue_node_t *root, queue_node_t *new_obj);
 void queue_priority_add_generic(queue_node_t *root, queue_node_t *new_obj, int(*cmp)(queue_node_t *, queue_node_t *)) ;
 void queue_remove(queue_node_t *root, queue_node_t *node);
 
+#if ENABLE_DEBUG
 void queue_print(queue_node_t *node);
 void queue_print_node(queue_node_t *node);
+#endif
 
 /** @} */
 #endif // __QUEUE_H

core/queue.c

@@ -96,7 +96,7 @@ void queue_priority_add_generic(queue_node_t *root, queue_node_t *new_obj, int (
     new_obj->next = NULL;
 }
 
-
+#if ENABLE_DEBUG
 void queue_print(queue_node_t *node)
 {
     printf("queue:\n");
@@ -111,6 +111,7 @@ void queue_print_node(queue_node_t *node)
 {
     printf("Data: %u Priority: %"PRIu32" Next: %u\n", (unsigned int)node->data, node->priority, (unsigned int)node->next);
 }
+#endif
 
 /*
 int main() {

sys/include/vtimer.h

@@ -91,6 +91,8 @@ int vtimer_set_wakeup(vtimer_t *t, timex_t interval, int pid);
  */
 int vtimer_remove(vtimer_t *t);
 
+#if ENABLE_DEBUG
+
 /**
  * @brief Prints a vtimer_t
  */
@@ -106,4 +108,6 @@ void vtimer_print_short_queue(void);
  */
 void vtimer_print_long_queue(void);
 
+#endif
+
 #endif /* __VTIMER_H */

sys/lib/ringbuffer.c

@@ -25,10 +25,10 @@
 #include "malloc.h"
 #endif
 
-#include "ringbuffer.h"
+#define ENABLE_DEBUG (0)
+#include "debug.h"
 
-//#define DEBUG(...) printf (__VA_ARGS__)
-#define DEBUG(...)
+#include "ringbuffer.h"
 
 void ringbuffer_init(ringbuffer_t *rb, char *buffer, unsigned int bufsize)
 {

sys/vtimer/vtimer.c

@@ -290,6 +290,8 @@ int vtimer_set_msg(vtimer_t *t, timex_t interval, unsigned int pid, void *ptr)
     return 0;
 }
 
+#if ENABLE_DEBUG
+
 void vtimer_print_short_queue(){
     queue_print(&shortterm_queue_root);
 }
@@ -309,3 +311,5 @@ void vtimer_print(vtimer_t *t)
            t->arg,
            t->pid);
 }
+
+#endif