[Olsr-cvs] olsrd-current/lib/txtinfo/src olsrd_txtinfo.c,1.4,1.5

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/txtinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19064/lib/txtinfo/src

Modified Files:
	olsrd_txtinfo.c 
Log Message:
* do not mix declarations and code

Index: olsrd_txtinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/txtinfo/src/olsrd_txtinfo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** olsrd_txtinfo.c	22 Apr 2007 19:54:31 -0000	1.4
--- olsrd_txtinfo.c	28 Apr 2007 19:58:49 -0000	1.5
***************
*** 243,246 ****
--- 243,250 ----
    else
      {
+       fd_set rfds;
+       struct timeval tv = {0,0};
+       int neighonly = 0;
+ 
        addr = inet_ntoa(pin.sin_addr);
        if(ntohl(pin.sin_addr.s_addr) != ntohl(ipc_accept_ip.s_addr))
***************
*** 258,266 ****
        
        /* purge read buffer to prevent blocking on linux*/
-       fd_set rfds;
        FD_ZERO(&rfds);
        FD_SET(ipc_connection, &rfds);
-       struct timeval tv = {0,0};
-       int neighonly = 0;
        if(select(ipc_connection+1, &rfds, NULL, NULL, &tv)) {
          char requ[128];
--- 262,267 ----
***************
*** 431,434 ****
--- 432,437 ----
    struct hna_entry *tmp_hna;
    struct hna_net *tmp_net;
+   struct hna4_entry *hna4;
+   struct hna6_entry *hna6;
  
    size = 0;
***************
*** 437,441 ****
  
    /* Announced HNA entries */
- 	struct hna4_entry *hna4;
  	for(hna4 = olsr_cnf->hna4_entries; hna4; hna4 = hna4->next)
  	  {
--- 440,443 ----
***************
*** 445,449 ****
  				olsr_ip_to_string(&olsr_cnf->main_addr));
  	  }
- 	struct hna6_entry *hna6;
  	for(hna6 = olsr_cnf->hna6_entries; hna6; hna6 = hna6->next)
  	  {
--- 447,450 ----