On 12/02/2009 04:24 PM, Linus Lüssing wrote:

In commit 1488 the orig_str has been removed from purge_orig_neighbours(). Apparently, this breaks compilation when enabling debug-flags, as bat_dbg() is expecting this variable as a parameter. Actually, this variable has never been initialised also before commit 1488 (which was probably the reason for mistakenly removing it). This tiny patch adds the orig_str again, but initialises it now as well.

Signed-off-by: Linus Lüssinglinus.luessing@web.de

Index: originator.c

--- originator.c (revision 1489) +++ originator.c (working copy) @@ -163,7 +163,7 @@ struct neigh_node **best_neigh_node) { struct list_head *list_pos, *list_pos_tmp;

•   char neigh_str[ETH_STR_LEN];
  

•   char neigh_str[ETH_STR_LEN], orig_str[ETH_STR_LEN];
     struct neigh_node *neigh_node;
     bool neigh_purged = false;
  
  

@@ -179,6 +179,7 @@ ((PURGE_TIMEOUT * HZ) / 1000)))) {

                     addr_to_string(neigh_str, neigh_node->addr);

•                   addr_to_string(orig_str, orig_node->orig);
                     bat_dbg(DBG_BATMAN, "Neighbour timeout: originator %s, neighbour: %s, last_valid %lu\n", orig_str, neigh_str, (neigh_node->last_valid / HZ));
  
                     neigh_purged = true;
  
  

=================

Shouldn't the "addr_to_string(orig_str, orig_node->orig);" be moved out side the loop to near the top of the function? There is only one originator node and there is no reason to iterate over it. One time should suffice.

Gus