*: reindentreindent-3.0-after

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

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

1 files changed, 129 insertions, 137 deletions

diff --git a/lib/thread.h b/lib/thread.h
index 6cb7896e7d..bf89dcf0f6 100644
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU Zebra; see the file COPYING.  If not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * 02111-1307, USA.
  */
 
 #ifndef _ZEBRA_THREAD_H
@@ -25,21 +25,19 @@
 #include <zebra.h>
 #include "monotime.h"
 
-struct rusage_t
-{
-  struct rusage cpu;
-  struct timeval real;
+struct rusage_t {
+	struct rusage cpu;
+	struct timeval real;
 };
 #define RUSAGE_T        struct rusage_t
 
 #define GETRUSAGE(X) thread_getrusage(X)
 
 /* Linked list of thread. */
-struct thread_list
-{
-  struct thread *head;
-  struct thread *tail;
-  int count;
+struct thread_list {
+	struct thread *head;
+	struct thread *tail;
+	int count;
 };
 
 struct pqueue;
@@ -52,78 +50,72 @@ typedef fd_set thread_fd_set;
 
 #if defined(HAVE_POLL_CALL)
 #include <poll.h>
-struct fd_handler
-{
-  /* number of pfd stored in pfds */
-  nfds_t pfdcount;
-  /* number of pfd stored in pfds + number of snmp pfd */
-  nfds_t pfdcountsnmp;
-  /* number of pfd that fit in the allocated space of pfds */
-  nfds_t pfdsize;
-  struct pollfd *pfds;
+struct fd_handler {
+	/* number of pfd stored in pfds */
+	nfds_t pfdcount;
+	/* number of pfd stored in pfds + number of snmp pfd */
+	nfds_t pfdcountsnmp;
+	/* number of pfd that fit in the allocated space of pfds */
+	nfds_t pfdsize;
+	struct pollfd *pfds;
 };
 #else
-struct fd_handler
-{
-  fd_set readfd;
-  fd_set writefd;
-  fd_set exceptfd;
+struct fd_handler {
+	fd_set readfd;
+	fd_set writefd;
+	fd_set exceptfd;
 };
 #endif
 
 /* Master of the theads. */
-struct thread_master
-{
-  struct thread **read;
-  struct thread **write;
-  struct pqueue *timer;
-  struct thread_list event;
-  struct thread_list ready;
-  struct thread_list unuse;
-  struct pqueue *background;
-  int fd_limit;
-  struct fd_handler handler;
-  unsigned long alloc;
+struct thread_master {
+	struct thread **read;
+	struct thread **write;
+	struct pqueue *timer;
+	struct thread_list event;
+	struct thread_list ready;
+	struct thread_list unuse;
+	struct pqueue *background;
+	int fd_limit;
+	struct fd_handler handler;
+	unsigned long alloc;
 };
 
 typedef unsigned char thread_type;
 
 /* Thread itself. */
-struct thread
-{
-  thread_type type;		/* thread type */
-  thread_type add_type;		/* thread type */
-  struct thread *next;		/* next pointer of the thread */   
-  struct thread *prev;		/* previous pointer of the thread */
-  struct thread_master *master;	/* pointer to the struct thread_master. */
-  int (*func) (struct thread *); /* event function */
-  void *arg;			/* event argument */
-  union {
-    int val;			/* second argument of the event. */
-    int fd;			/* file descriptor in case of read/write. */
-    struct timeval sands;	/* rest of time sands value. */
-  } u;
-  int index;			/* used for timers to store position in queue */
-  struct timeval real;
-  struct cpu_thread_history *hist; /* cache pointer to cpu_history */
-  unsigned long yield; /* yield time in us */
-  const char *funcname;
-  const char *schedfrom;
-  int schedfrom_line;
+struct thread {
+	thread_type type;	     /* thread type */
+	thread_type add_type;	 /* thread type */
+	struct thread *next;	  /* next pointer of the thread */
+	struct thread *prev;	  /* previous pointer of the thread */
+	struct thread_master *master; /* pointer to the struct thread_master. */
+	int (*func)(struct thread *); /* event function */
+	void *arg;		      /* event argument */
+	union {
+		int val; /* second argument of the event. */
+		int fd;  /* file descriptor in case of read/write. */
+		struct timeval sands; /* rest of time sands value. */
+	} u;
+	int index; /* used for timers to store position in queue */
+	struct timeval real;
+	struct cpu_thread_history *hist; /* cache pointer to cpu_history */
+	unsigned long yield;		 /* yield time in us */
+	const char *funcname;
+	const char *schedfrom;
+	int schedfrom_line;
 };
 
-struct cpu_thread_history 
-{
-  int (*func)(struct thread *);
-  unsigned int total_calls;
-  unsigned int total_active;
-  struct time_stats
-  {
-    unsigned long total, max;
-  } real;
-  struct time_stats cpu;
-  thread_type types;
-  const char *funcname;
+struct cpu_thread_history {
+	int (*func)(struct thread *);
+	unsigned int total_calls;
+	unsigned int total_active;
+	struct time_stats {
+		unsigned long total, max;
+	} real;
+	struct time_stats cpu;
+	thread_type types;
+	const char *funcname;
 };
 
 /* Struct timeval's tv_usec one second value.  */
@@ -147,38 +139,38 @@ struct cpu_thread_history
 #define THREAD_FD(X)  ((X)->u.fd)
 #define THREAD_VAL(X) ((X)->u.val)
 
-#define THREAD_READ_ON(master,thread,func,arg,sock) \
-  do { \
-    if (! thread) \
-      thread = thread_add_read (master, func, arg, sock); \
-  } while (0)
-
-#define THREAD_WRITE_ON(master,thread,func,arg,sock) \
-  do { \
-    if (! thread) \
-      thread = thread_add_write (master, func, arg, sock); \
-  } while (0)
-
-#define THREAD_TIMER_ON(master,thread,func,arg,time) \
-  do { \
-    if (! thread) \
-      thread = thread_add_timer (master, func, arg, time); \
-  } while (0)
-
-#define THREAD_TIMER_MSEC_ON(master,thread,func,arg,time) \
-  do { \
-    if (! thread) \
-      thread = thread_add_timer_msec (master, func, arg, time); \
-  } while (0)
-
-#define THREAD_OFF(thread) \
-  do { \
-    if (thread) \
-      { \
-        thread_cancel (thread); \
-        thread = NULL; \
-      } \
-  } while (0)
+#define THREAD_READ_ON(master, thread, func, arg, sock)                        \
+	do {                                                                   \
+		if (!thread)                                                   \
+			thread = thread_add_read(master, func, arg, sock);     \
+	} while (0)
+
+#define THREAD_WRITE_ON(master, thread, func, arg, sock)                       \
+	do {                                                                   \
+		if (!thread)                                                   \
+			thread = thread_add_write(master, func, arg, sock);    \
+	} while (0)
+
+#define THREAD_TIMER_ON(master, thread, func, arg, time)                       \
+	do {                                                                   \
+		if (!thread)                                                   \
+			thread = thread_add_timer(master, func, arg, time);    \
+	} while (0)
+
+#define THREAD_TIMER_MSEC_ON(master, thread, func, arg, time)                  \
+	do {                                                                   \
+		if (!thread)                                                   \
+			thread = thread_add_timer_msec(master, func, arg,      \
+						       time);                  \
+	} while (0)
+
+#define THREAD_OFF(thread)                                                     \
+	do {                                                                   \
+		if (thread) {                                                  \
+			thread_cancel(thread);                                 \
+			thread = NULL;                                         \
+		}                                                              \
+	} while (0)
 
 #define THREAD_READ_OFF(thread)  THREAD_OFF(thread)
 #define THREAD_WRITE_OFF(thread)  THREAD_OFF(thread)
@@ -198,49 +190,49 @@ struct cpu_thread_history
 #define thread_add_background(m,f,a,v) funcname_thread_add_background(m,f,a,v,#f,__FILE__,__LINE__)
 
 /* Prototypes. */
-extern struct thread_master *thread_master_create (void);
-extern void thread_master_free (struct thread_master *);
+extern struct thread_master *thread_master_create(void);
+extern void thread_master_free(struct thread_master *);
 extern void thread_master_free_unused(struct thread_master *);
 
-extern struct thread *funcname_thread_add_read_write (int dir, struct thread_master *,
-				                int (*)(struct thread *),
-				                void *, int, debugargdef);
-extern struct thread *funcname_thread_add_timer (struct thread_master *,
-				                 int (*)(struct thread *),
-				                 void *, long, debugargdef);
-extern struct thread *funcname_thread_add_timer_msec (struct thread_master *,
-				                      int (*)(struct thread *),
-				                      void *, long, debugargdef);
-extern struct thread *funcname_thread_add_timer_tv (struct thread_master *,
-				                    int (*)(struct thread *),
-				                    void *, struct timeval *,
-						    debugargdef);
-extern struct thread *funcname_thread_add_event (struct thread_master *,
-				                 int (*)(struct thread *),
-				                 void *, int, debugargdef);
-extern struct thread *funcname_thread_add_background (struct thread_master *,
-                                               int (*func)(struct thread *),
-				               void *arg,
-				               long milliseconds_to_delay,
-					       debugargdef);
-extern struct thread *funcname_thread_execute (struct thread_master *,
-                                               int (*)(struct thread *),
-                                               void *, int, debugargdef);
+extern struct thread *funcname_thread_add_read_write(int dir,
+						     struct thread_master *,
+						     int (*)(struct thread *),
+						     void *, int, debugargdef);
+extern struct thread *funcname_thread_add_timer(struct thread_master *,
+						int (*)(struct thread *),
+						void *, long, debugargdef);
+extern struct thread *funcname_thread_add_timer_msec(struct thread_master *,
+						     int (*)(struct thread *),
+						     void *, long, debugargdef);
+extern struct thread *funcname_thread_add_timer_tv(struct thread_master *,
+						   int (*)(struct thread *),
+						   void *, struct timeval *,
+						   debugargdef);
+extern struct thread *funcname_thread_add_event(struct thread_master *,
+						int (*)(struct thread *),
+						void *, int, debugargdef);
+extern struct thread *
+funcname_thread_add_background(struct thread_master *,
+			       int (*func)(struct thread *), void *arg,
+			       long milliseconds_to_delay, debugargdef);
+extern struct thread *funcname_thread_execute(struct thread_master *,
+					      int (*)(struct thread *), void *,
+					      int, debugargdef);
 #undef debugargdef
 
-extern void thread_cancel (struct thread *);
-extern unsigned int thread_cancel_event (struct thread_master *, void *);
-extern struct thread *thread_fetch (struct thread_master *, struct thread *);
-extern void thread_call (struct thread *);
-extern unsigned long thread_timer_remain_second (struct thread *);
-extern struct timeval thread_timer_remain(struct thread*);
-extern int thread_should_yield (struct thread *);
+extern void thread_cancel(struct thread *);
+extern unsigned int thread_cancel_event(struct thread_master *, void *);
+extern struct thread *thread_fetch(struct thread_master *, struct thread *);
+extern void thread_call(struct thread *);
+extern unsigned long thread_timer_remain_second(struct thread *);
+extern struct timeval thread_timer_remain(struct thread *);
+extern int thread_should_yield(struct thread *);
 /* set yield time for thread */
-extern void thread_set_yield_time (struct thread *, unsigned long);
+extern void thread_set_yield_time(struct thread *, unsigned long);
 
 /* Internal libfrr exports */
-extern void thread_getrusage (RUSAGE_T *);
-extern void thread_cmd_init (void);
+extern void thread_getrusage(RUSAGE_T *);
+extern void thread_cmd_init(void);
 
 /* Returns elapsed real (wall clock) time. */
 extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before,