Re: remove errant ifstated whitespace

2017-06-28 Thread Sebastian Benoit
commited, thx

Rob Pierce(r...@2keys.ca) on 2017.06.27 21:33:06 -0400:
> 
> Index: ifstated.c
> ===
> RCS file: /cvs/src/usr.sbin/ifstated/ifstated.c,v
> retrieving revision 1.43
> diff -u -p -r1.43 ifstated.c
> --- ifstated.c27 Jun 2017 20:46:34 -  1.43
> +++ ifstated.c28 Jun 2017 01:30:02 -
> @@ -151,12 +151,12 @@ main(int argc, char *argv[])
>  
>   rtfilter = ROUTE_FILTER(RTM_IFINFO);
>   if (setsockopt(rt_fd, PF_ROUTE, ROUTE_MSGFILTER,
> - , sizeof(rtfilter)) == -1) /* not fatal */
> + , sizeof(rtfilter)) == -1) /* not fatal */
>   log_warn("%s: setsockopt msgfilter", __func__);
>  
>   rtfilter = RTABLE_ANY;
>   if (setsockopt(rt_fd, PF_ROUTE, ROUTE_TABLEFILTER,
> - , sizeof(rtfilter)) == -1) /* not fatal */
> + , sizeof(rtfilter)) == -1) /* not fatal */
>   log_warn("%s: setsockopt tablefilter", __func__);
>  
>   signal_set(_ev, SIGCHLD, sigchld_handler, NULL);
> @@ -605,7 +605,7 @@ fetch_state(void)
>  
>   for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
>   struct ifreq ifr;
> - struct if_data  ifrdat;
> + struct if_data ifrdat;
>  
>   if (oname && !strcmp(oname, ifa->ifa_name))
>   continue;
> @@ -623,8 +623,6 @@ fetch_state(void)
>   freeifaddrs(ifap);
>   close(sock);
>  }
> -
> -
>  
>  /*
>   * Clear the config.
> Index: ifstated.h
> ===
> RCS file: /cvs/src/usr.sbin/ifstated/ifstated.h,v
> retrieving revision 1.11
> diff -u -p -r1.11 ifstated.h
> --- ifstated.h18 Jun 2017 12:03:47 -  1.11
> +++ ifstated.h28 Jun 2017 01:30:02 -
> @@ -29,7 +29,6 @@
>  #include 
>  #include 
>  
> -
>  struct ifsd_expression;
>  TAILQ_HEAD(ifsd_expression_list, ifsd_expression);
>  
> @@ -80,7 +79,6 @@ struct ifsd_action {
>  #define IFSD_ACTION_CHANGESTATE  2
>  #define IFSD_ACTION_CONDITION3
>  };
> -
>  
>  struct ifsd_expression {
>   TAILQ_ENTRY(ifsd_expression) entries;
> 



remove errant ifstated whitespace

2017-06-27 Thread Rob Pierce

Index: ifstated.c
===
RCS file: /cvs/src/usr.sbin/ifstated/ifstated.c,v
retrieving revision 1.43
diff -u -p -r1.43 ifstated.c
--- ifstated.c  27 Jun 2017 20:46:34 -  1.43
+++ ifstated.c  28 Jun 2017 01:30:02 -
@@ -151,12 +151,12 @@ main(int argc, char *argv[])
 
rtfilter = ROUTE_FILTER(RTM_IFINFO);
if (setsockopt(rt_fd, PF_ROUTE, ROUTE_MSGFILTER,
-   , sizeof(rtfilter)) == -1) /* not fatal */
+   , sizeof(rtfilter)) == -1) /* not fatal */
log_warn("%s: setsockopt msgfilter", __func__);
 
rtfilter = RTABLE_ANY;
if (setsockopt(rt_fd, PF_ROUTE, ROUTE_TABLEFILTER,
-   , sizeof(rtfilter)) == -1) /* not fatal */
+   , sizeof(rtfilter)) == -1) /* not fatal */
log_warn("%s: setsockopt tablefilter", __func__);
 
signal_set(_ev, SIGCHLD, sigchld_handler, NULL);
@@ -605,7 +605,7 @@ fetch_state(void)
 
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
struct ifreq ifr;
-   struct if_data  ifrdat;
+   struct if_data ifrdat;
 
if (oname && !strcmp(oname, ifa->ifa_name))
continue;
@@ -623,8 +623,6 @@ fetch_state(void)
freeifaddrs(ifap);
close(sock);
 }
-
-
 
 /*
  * Clear the config.
Index: ifstated.h
===
RCS file: /cvs/src/usr.sbin/ifstated/ifstated.h,v
retrieving revision 1.11
diff -u -p -r1.11 ifstated.h
--- ifstated.h  18 Jun 2017 12:03:47 -  1.11
+++ ifstated.h  28 Jun 2017 01:30:02 -
@@ -29,7 +29,6 @@
 #include 
 #include 
 
-
 struct ifsd_expression;
 TAILQ_HEAD(ifsd_expression_list, ifsd_expression);
 
@@ -80,7 +79,6 @@ struct ifsd_action {
 #define IFSD_ACTION_CHANGESTATE2
 #define IFSD_ACTION_CONDITION  3
 };
-
 
 struct ifsd_expression {
TAILQ_ENTRY(ifsd_expression) entries;