From ae815c22e2975ccaff627661d5f242764e0f8129 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Fri, 8 Jun 2018 14:01:33 +0200 Subject: [PATCH] C++ fixes --- n2n.c | 8 ++++---- n2n.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/n2n.c b/n2n.c index d5c293c..2d1878f 100644 --- a/n2n.c +++ b/n2n.c @@ -279,11 +279,11 @@ size_t peer_list_size(const struct peer_info * list) * insertion. list takes ownership of new. */ void peer_list_add(struct peer_info * * list, - struct peer_info * new) + struct peer_info * newp) { - new->next = *list; - new->last_seen = time(NULL); - *list = new; + newp->next = *list; + newp->last_seen = time(NULL); + *list = newp; } diff --git a/n2n.h b/n2n.h index f0a56ca..2ad827e 100644 --- a/n2n.h +++ b/n2n.h @@ -220,11 +220,13 @@ struct n2n_edge { /* ************************************** */ +#ifndef TRACE_ERROR #define TRACE_ERROR 0, __FILE__, __LINE__ #define TRACE_WARNING 1, __FILE__, __LINE__ #define TRACE_NORMAL 2, __FILE__, __LINE__ #define TRACE_INFO 3, __FILE__, __LINE__ #define TRACE_DEBUG 4, __FILE__, __LINE__ +#endif /* ************************************** */ @@ -281,7 +283,7 @@ void print_n2n_version(); struct peer_info * find_peer_by_mac( struct peer_info * list, const n2n_mac_t mac ); void peer_list_add( struct peer_info * * list, - struct peer_info * new ); + struct peer_info * newp ); size_t peer_list_size( const struct peer_info * list ); size_t purge_peer_list( struct peer_info ** peer_list, time_t purge_before );