*: reindentreindent-master-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 81 insertions, 99 deletions

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 9d700305ed..0cb54d4335 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -40,34 +40,24 @@
 #include "ripngd/ripngd.h"
 
 /* RIPngd options. */
-struct option longopts[] = 
-{
-  { "retain",      no_argument,       NULL, 'r'},
-  { 0 }
-};
+struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
 
 /* ripngd privileges */
-zebra_capabilities_t _caps_p [] = 
-{
-  ZCAP_NET_RAW,
-  ZCAP_BIND
-};
+zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND};
 
-struct zebra_privs_t ripngd_privs =
-{
+struct zebra_privs_t ripngd_privs = {
 #if defined(FRR_USER)
-  .user = FRR_USER,
+	.user = FRR_USER,
 #endif
 #if defined FRR_GROUP
-  .group = FRR_GROUP,
+	.group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+	.vty_group = VTY_GROUP,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = 2,
-  .cap_num_i = 0
-};
+	.caps_p = _caps_p,
+	.cap_num_p = 2,
+	.cap_num_i = 0};
 
 
 /* RIPngd program name */
@@ -81,113 +71,105 @@ struct thread_master *master;
 static struct frr_daemon_info ripngd_di;
 
 /* SIGHUP handler. */
-static void 
-sighup (void)
+static void sighup(void)
 {
-  zlog_info ("SIGHUP received");
-  ripng_clean ();
-  ripng_reset ();
+	zlog_info("SIGHUP received");
+	ripng_clean();
+	ripng_reset();
 
-  /* Reload config file. */
-  vty_read_config (ripngd_di.config_file, config_default);
+	/* Reload config file. */
+	vty_read_config(ripngd_di.config_file, config_default);
 
-  /* Try to return to normal operation. */
+	/* Try to return to normal operation. */
 }
 
 /* SIGINT handler. */
-static void
-sigint (void)
+static void sigint(void)
 {
-  zlog_notice ("Terminating on signal");
+	zlog_notice("Terminating on signal");
 
-  if (! retain_mode)
-    ripng_clean ();
+	if (!retain_mode)
+		ripng_clean();
 
-  ripng_zebra_stop ();
-  exit (0);
+	ripng_zebra_stop();
+	exit(0);
 }
 
 /* SIGUSR1 handler. */
-static void
-sigusr1 (void)
+static void sigusr1(void)
 {
-  zlog_rotate();
+	zlog_rotate();
 }
 
-struct quagga_signal_t ripng_signals[] =
-{
-  { 
-    .signal = SIGHUP, 
-    .handler = &sighup,
-  },
-  {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
-  },
-  {
-    .signal = SIGINT,
-    .handler = &sigint,
-  },
-  {
-    .signal = SIGTERM,
-    .handler = &sigint,
-  },
+struct quagga_signal_t ripng_signals[] = {
+	{
+		.signal = SIGHUP,
+		.handler = &sighup,
+	},
+	{
+		.signal = SIGUSR1,
+		.handler = &sigusr1,
+	},
+	{
+		.signal = SIGINT,
+		.handler = &sigint,
+	},
+	{
+		.signal = SIGTERM,
+		.handler = &sigint,
+	},
 };
 
-FRR_DAEMON_INFO(ripngd, RIPNG,
-	.vty_port = RIPNG_VTY_PORT,
+FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
 
-	.proghelp = "Implementation of the RIPng routing protocol.",
+		.proghelp = "Implementation of the RIPng routing protocol.",
 
-	.signals = ripng_signals,
-	.n_signals = array_size(ripng_signals),
+		.signals = ripng_signals,
+		.n_signals = array_size(ripng_signals),
 
-	.privs = &ripngd_privs,
-)
+		.privs = &ripngd_privs, )
 
 /* RIPngd main routine. */
-int
-main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-  frr_preinit (&ripngd_di, argc, argv);
-  frr_opt_add ("r", longopts,
-	"  -r, --retain       When program terminates, retain added route by ripd.\n");
-
-  while (1) 
-    {
-      int opt;
-
-      opt = frr_getopt (argc, argv, NULL);
-    
-      if (opt == EOF)
-	break;
-
-      switch (opt) 
-	{
-	case 0:
-	  break;
-	case 'r':
-	  retain_mode = 1;
-	  break;
-	default:
-	  frr_help_exit (1);
-	  break;
+	frr_preinit(&ripngd_di, argc, argv);
+	frr_opt_add(
+		"r", longopts,
+		"  -r, --retain       When program terminates, retain added route by ripd.\n");
+
+	while (1) {
+		int opt;
+
+		opt = frr_getopt(argc, argv, NULL);
+
+		if (opt == EOF)
+			break;
+
+		switch (opt) {
+		case 0:
+			break;
+		case 'r':
+			retain_mode = 1;
+			break;
+		default:
+			frr_help_exit(1);
+			break;
+		}
 	}
-    }
 
-  master = frr_init ();
+	master = frr_init();
 
-  /* Library inits. */
-  vrf_init (NULL, NULL, NULL, NULL);
+	/* Library inits. */
+	vrf_init(NULL, NULL, NULL, NULL);
 
-  /* RIPngd inits. */
-  ripng_init ();
-  zebra_init(master);
-  ripng_peer_init ();
+	/* RIPngd inits. */
+	ripng_init();
+	zebra_init(master);
+	ripng_peer_init();
 
-  frr_config_fork ();
-  frr_run (master);
+	frr_config_fork();
+	frr_run(master);
 
-  /* Not reached. */
-  return 0;
+	/* Not reached. */
+	return 0;
 }