[Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_plugin.c, 1.19, 1.20

[Bernd Petrovitsch]

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

Modified Files:
	olsrd_plugin.c 
Log Message:
- applied 115-olsrd-nameserviceparamfix.patch and
  116-olsrd-fix-pluginparam-addons.patch by Sven-Ola Tücke
  <(spam-protected)> fixing the compilation warning on 64bit.


Index: olsrd_plugin.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_plugin.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** olsrd_plugin.c	16 Sep 2007 22:14:08 -0000	1.19
--- olsrd_plugin.c	17 Sep 2007 21:57:05 -0000	1.20
***************
*** 65,70 ****
  static void my_fini(void) __attribute__ ((destructor));
  
! static int add_plugin_ipnet(const char *value, void *data, unsigned int);
! static int add_plugin_ipaddr(const char *value, void *data, unsigned int);
  
  static int insert_plugin_ipnet(const char *sz_net, const char *sz_mask, struct allowed_net **allowed_nets);
--- 65,70 ----
  static void my_fini(void) __attribute__ ((destructor));
  
! static int add_plugin_ipnet(const char *value, void *data, set_plugin_parameter_addon);
! static int add_plugin_ipaddr(const char *value, void *data, set_plugin_parameter_addon);
  
  static int insert_plugin_ipnet(const char *sz_net, const char *sz_mask, struct allowed_net **allowed_nets);
***************
*** 141,148 ****
  }
  
! static int add_plugin_ipnet(const char *value, void *data, unsigned int addon)
  {
      char sz_net[100], sz_mask[100]; /* IPv6 in the future */
-     if (addon) {}
  
      if(sscanf(value, "%99s %99s", sz_net, sz_mask) != 2) {
--- 141,147 ----
  }
  
! static int add_plugin_ipnet(const char *value, void *data, set_plugin_parameter_addon addon __attribute__((unused)))
  {
      char sz_net[100], sz_mask[100]; /* IPv6 in the future */
  
      if(sscanf(value, "%99s %99s", sz_net, sz_mask) != 2) {
***************
*** 153,159 ****
  }
  
! static int add_plugin_ipaddr(const char *value, void *data, unsigned int addon)
  {
-     if (addon) {}
      return insert_plugin_ipnet(value, "255.255.255.255", data);
  }
--- 152,157 ----
  }
  
! static int add_plugin_ipaddr(const char *value, void *data, set_plugin_parameter_addon addon __attribute__((unused)))
  {
      return insert_plugin_ipnet(value, "255.255.255.255", data);
  }