[Olsr-cvs] olsrd-current/src/bsd kernel_routes.c, 1.9, 1.10 net.c, 1.32, 1.33

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src/bsd
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2640/src/bsd

Modified Files:
	kernel_routes.c net.c 
Log Message:
* OLSR_PRINTF() is now a real C expression
* removed superflous type-casts


Index: net.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/bsd/net.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** net.c	14 Mar 2007 14:01:13 -0000	1.32
--- net.c	25 Apr 2007 22:08:17 -0000	1.33
***************
*** 525,529 ****
  
  
!   OLSR_PRINTF(3, "OK\n")
    return 0;
  }
--- 525,529 ----
  
  
!   OLSR_PRINTF(3, "OK\n");
    return 0;
  }
***************
*** 640,644 ****
    if (context == NULL)
      {
!       OLSR_PRINTF (1, "libnet init: %s\n", libnet_geterror (context))
        return (0);
      }
--- 640,644 ----
    if (context == NULL)
      {
!       OLSR_PRINTF (1, "libnet init: %s\n", libnet_geterror (context));
        return (0);
      }
***************
*** 660,664 ****
    if (udp_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet UDP header: %s\n", libnet_geterror (context))
  	return (0);
      }
--- 660,664 ----
    if (udp_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet UDP header: %s\n", libnet_geterror (context));
  	return (0);
      }
***************
*** 679,683 ****
    if (ip_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet IP header: %s\n", libnet_geterror (context))
        return (0);
      }
--- 679,683 ----
    if (ip_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet IP header: %s\n", libnet_geterror (context));
        return (0);
      }
***************
*** 692,696 ****
    if (ether_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet ethernet header: %s\n", libnet_geterror (context))
        return (0);
      }
--- 692,696 ----
    if (ether_tag == -1)
      {
!       OLSR_PRINTF (1, "libnet ethernet header: %s\n", libnet_geterror (context));
        return (0);
      }
***************
*** 699,703 ****
    if (status == -1)
      {
!       OLSR_PRINTF (1, "libnet packet write: %s\n", libnet_geterror (context))
        return (0);
      }
--- 699,703 ----
    if (status == -1)
      {
!       OLSR_PRINTF (1, "libnet packet write: %s\n", libnet_geterror (context));
        return (0);
      }
***************
*** 864,872 ****
        if(ioctl(olsr_cnf->ioctl_s, SIOCGIFMEDIA, &ifm) < 0)
  	{
! 	  OLSR_PRINTF(1, "Error SIOCGIFMEDIA(%s)\n", ifm.ifm_name)
  	  return WEIGHT_ETHERNET_DEFAULT;
  	}
  
!       OLSR_PRINTF(1, "%s: STATUS 0x%08x\n", ifm.ifm_name, ifm.ifm_status)
  #endif
        return WEIGHT_ETHERNET_DEFAULT;
--- 864,872 ----
        if(ioctl(olsr_cnf->ioctl_s, SIOCGIFMEDIA, &ifm) < 0)
  	{
! 	  OLSR_PRINTF(1, "Error SIOCGIFMEDIA(%s)\n", ifm.ifm_name);
  	  return WEIGHT_ETHERNET_DEFAULT;
  	}
  
!       OLSR_PRINTF(1, "%s: STATUS 0x%08x\n", ifm.ifm_name, ifm.ifm_status);
  #endif
        return WEIGHT_ETHERNET_DEFAULT;

Index: kernel_routes.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/bsd/kernel_routes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kernel_routes.c	14 Feb 2007 09:09:16 -0000	1.9
--- kernel_routes.c	25 Apr 2007 22:08:17 -0000	1.10
***************
*** 69,73 ****
  
    OLSR_PRINTF(1, "%s IPv4 route to %s/%s via %s.\n",
!     (add != 0) ? "Adding" : "Removing", Str1, Str2, Str3)
  
    memset(buff, 0, sizeof (buff));
--- 69,73 ----
  
    OLSR_PRINTF(1, "%s IPv4 route to %s/%s via %s.\n",
!     (add != 0) ? "Adding" : "Removing", Str1, Str2, Str3);
  
    memset(buff, 0, sizeof (buff));