[Olsr-cvs] olsrd-current/lib/nameservice/src nameservice.c, 1.22, 1.23

[Bernd Petrovitsch]

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

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

Index: nameservice.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/nameservice.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** nameservice.c	25 Apr 2007 22:08:06 -0000	1.22
--- nameservice.c	28 Apr 2007 19:58:49 -0000	1.23
***************
*** 262,273 ****
  	struct name_entry *name;
  	union olsr_ip_addr ipz;
- 
- 	memset(&ipz, 0, sizeof(ipz));
- 
      int ret;
      //regex string for validating the hostnames
      char *regex_name = "^[[:alnum:]_.-]+$";
      //regex string for the service line
      char *regex_service = olsr_malloc(256*sizeof(char) + strlen(my_suffix), "new *char from name_init for regex_service");
  
      //compile the regex from the string
--- 262,272 ----
  	struct name_entry *name;
  	union olsr_ip_addr ipz;
      int ret;
+ 
      //regex string for validating the hostnames
      char *regex_name = "^[[:alnum:]_.-]+$";
      //regex string for the service line
      char *regex_service = olsr_malloc(256*sizeof(char) + strlen(my_suffix), "new *char from name_init for regex_service");
+ 	memset(&ipz, 0, sizeof(ipz));
  
      //compile the regex from the string
***************
*** 678,684 ****
  	struct name_entry *already_saved_name_entries;
      char *name = (char*)from_packet + sizeof(struct name);
- 	olsr_printf(4, "\nNAME PLUGIN: decapsulating received name, service or forwarder \n");
      int type_of_from_packet = ntohs(from_packet->type);
      unsigned int len_of_name = ntohs(from_packet->len);
      
      // don't insert the received entry again, if it has already been inserted in the hash table. 
--- 677,683 ----
  	struct name_entry *already_saved_name_entries;
      char *name = (char*)from_packet + sizeof(struct name);
      int type_of_from_packet = ntohs(from_packet->type);
      unsigned int len_of_name = ntohs(from_packet->len);
+ 	olsr_printf(4, "\nNAME PLUGIN: decapsulating received name, service or forwarder \n");
      
      // don't insert the received entry again, if it has already been inserted in the hash table.