pgindent

13 files changed, 995 insertions, 891 deletions

diff --git a/machine/m_aix43.c b/machine/m_aix43.c
index 24887f2..52cf39a 100644
--- a/machine/m_aix43.c
+++ b/machine/m_aix43.c
@@ -158,11 +158,11 @@ int			compare_cpu(), compare_size(), compare_res(), compare_time(),
 int			(*proc_compares[]) () =
 {
 	compare_cpu,
-	compare_size,
-	compare_res,
-	compare_time,
-	compare_prio,
-	NULL
+		compare_size,
+		compare_res,
+		compare_time,
+		compare_prio,
+		NULL
 };
 
 /* useful externals */
@@ -209,7 +209,7 @@ unsigned long curtime;
 /*
  * Initialize globals, get kernel offsets and stuff...
  */
-machine_init(struct statics * statics)
+machine_init(struct statics *statics)
 
 {
 	time_t		uptime,
@@ -286,7 +286,7 @@ format_header(char *uname_field)
 
 
 void
-get_system_info(struct system_info * si)
+get_system_info(struct system_info *si)
 
 {
 	int			load_avg[3];
@@ -343,7 +343,7 @@ get_system_info(struct system_info * si)
 static struct handle handle;
 
 caddr_t
-get_process_info(struct system_info * si, struct process_select * sel, int compare_index)
+get_process_info(struct system_info *si, struct process_select *sel, int compare_index)
 
 {
 	int			i,
@@ -486,11 +486,11 @@ format_next_process(caddr_t handle, char *(*get_userid) ())
 			proc_ress,			/* resident */
 			ress_unit,			/* K or M */
 			state_abbrev[p->p_stat],	/* process state */
-			format_time(cpu_time),		/* time used */
+			format_time(cpu_time),	/* time used */
 			weighted_cpu(pi),	/* WCPU */
 			100.0 * double_pctcpu(p),	/* CPU */
-			printable(pi->pi_comm),		/* COMM */
-			(pi->pi_flags & SKPROC) == 0 ? "" : " (sys)"		/* kernel process? */
+			printable(pi->pi_comm), /* COMM */
+			(pi->pi_flags & SKPROC) == 0 ? "" : " (sys)"	/* kernel process? */
 		);
 	return (fmt);
 }
@@ -588,7 +588,7 @@ static unsigned char sorted_state[] =
 /* compare_cpu - the comparison function for sorting by cpu percentage */
 
 int
-compare_cpu(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
+compare_cpu(struct procsinfo **ppi1, struct procsinfo **ppi2)
 
 {
 	register struct procsinfo *pi1 = *ppi1,
@@ -616,7 +616,7 @@ compare_cpu(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
 /* compare_size - the comparison function for sorting by total memory usage */
 
 int
-compare_size(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
+compare_size(struct procsinfo **ppi1, struct procsinfo **ppi2)
 
 {
 	register struct procsinfo *pi1 = *ppi1,
@@ -644,7 +644,7 @@ compare_size(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
 /* compare_res - the comparison function for sorting by resident set size */
 
 int
-compare_res(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
+compare_res(struct procsinfo **ppi1, struct procsinfo **ppi2)
 
 {
 	register struct procsinfo *pi1 = *ppi1,
@@ -672,7 +672,7 @@ compare_res(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
 /* compare_time - the comparison function for sorting by total cpu time */
 
 int
-compare_time(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
+compare_time(struct procsinfo **ppi1, struct procsinfo **ppi2)
 
 {
 	register struct procsinfo *pi1 = *ppi1,
@@ -700,7 +700,7 @@ compare_time(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
 /* compare_prio - the comparison function for sorting by cpu percentage */
 
 int
-compare_prio(struct procsinfo ** ppi1, struct procsinfo ** ppi2)
+compare_prio(struct procsinfo **ppi1, struct procsinfo **ppi2)
 
 {
 	register struct procsinfo *pi1 = *ppi1,
diff --git a/machine/m_aix5.c b/machine/m_aix5.c
index 4946000..0656b57 100644
--- a/machine/m_aix5.c
+++ b/machine/m_aix5.c
@@ -162,11 +162,11 @@ int			compare_cpu(), compare_size(), compare_res(), compare_time(),
 int			(*proc_compares[]) () =
 {
 	compare_cpu,
-	compare_size,
-	compare_res,
-	compare_time,
-	compare_prio,
-	NULL
+		compare_size,
+		compare_res,
+		compare_time,
+		compare_prio,
+		NULL
 };
 
 /* useful externals */
@@ -231,8 +231,9 @@ xmalloc(long size)
  * Initialize globals, get kernel offsets and stuff...
  */
 int
-machine_init(statics)
+			machine_init(statics)
 struct statics *statics;
+
 {
 #ifdef OLD
 	if ((kmem = open(KMEM, O_RDONLY)) == -1)
@@ -283,9 +284,9 @@ struct statics *statics;
 	return (0);
 }
 
-char *
-format_header(uname_field)
+char	   *format_header(uname_field)
 register char *uname_field;
+
 {
 	register char *ptr;
 
@@ -302,8 +303,9 @@ register char *uname_field;
 
 
 void
-get_system_info(si)
+			get_system_info(si)
 struct system_info *si;
+
 {
 #ifdef OLD
 	long long	load_avg[3];
@@ -411,6 +413,7 @@ get_process_info(si, sel, compare_index)
 struct system_info *si;
 struct process_select *sel;
 int			compare_index;
+
 {
 	int			i,
 				nproc;
@@ -542,10 +545,10 @@ char		fmt[128];			/* static area where result is built */
 #define weighted_cpu(pp) (PROCTIME(pp) == 0 ? 0.0 : \
 						(((PROCTIME(pp)*100.0)/(curtime-pi->pi_start))))
 
-char *
-format_next_process(handle, get_userid)
-caddr_t		handle;
+char	   *format_next_process(handle, get_userid)
+			caddr_t handle;
 char	   *(*get_userid) ();
+
 {
 	register struct handle *hp;
 	register struct procentry64 *pi;
@@ -588,11 +591,11 @@ char	   *(*get_userid) ();
 			proc_ress,			/* resident */
 			ress_unit,			/* K or M */
 			state_abbrev[pi->pi_state], /* process state */
-			format_time(cpu_time),		/* time used */
+			format_time(cpu_time),	/* time used */
 			weighted_cpu(pi),	/* WCPU */
 			pi->pi_cpu / 100.0, /* CPU */
-			printable(pi->pi_comm),		/* COMM */
-			(pi->pi_flags & SKPROC) == 0 ? "" : " (sys)"		/* kernel process? */
+			printable(pi->pi_comm), /* COMM */
+			(pi->pi_flags & SKPROC) == 0 ? "" : " (sys)"	/* kernel process? */
 		);
 	return (fmt);
 }
@@ -610,11 +613,12 @@ char	   *(*get_userid) ();
  *
  */
 int
-getkval(offset, ptr, size, refstr)
+			getkval(offset, ptr, size, refstr)
 unsigned long offset;
 caddr_t		ptr;
 int			size;
 char	   *refstr;
+
 {
 	int			upper_2gb = 0;
 
@@ -690,9 +694,10 @@ static unsigned char sorted_state[] =
 /* compare_cpu - the comparison function for sorting by cpu percentage */
 
 int
-compare_cpu(ppi1, ppi2)
+			compare_cpu(ppi1, ppi2)
 struct procentry64 **ppi1;
 struct procentry64 **ppi2;
+
 {
 	register struct procentry64 *pi1 = *ppi1,
 			   *pi2 = *ppi2;
@@ -713,9 +718,10 @@ struct procentry64 **ppi2;
 /* compare_size - the comparison function for sorting by total memory usage */
 
 int
-compare_size(ppi1, ppi2)
+			compare_size(ppi1, ppi2)
 struct procentry64 **ppi1;
 struct procentry64 **ppi2;
+
 {
 	register struct procentry64 *pi1 = *ppi1,
 			   *pi2 = *ppi2;
@@ -736,9 +742,10 @@ struct procentry64 **ppi2;
 /* compare_res - the comparison function for sorting by resident set size */
 
 int
-compare_res(ppi1, ppi2)
+			compare_res(ppi1, ppi2)
 struct procentry64 **ppi1;
 struct procentry64 **ppi2;
+
 {
 	register struct procentry64 *pi1 = *ppi1,
 			   *pi2 = *ppi2;
@@ -759,9 +766,10 @@ struct procentry64 **ppi2;
 /* compare_time - the comparison function for sorting by total cpu time */
 
 int
-compare_time(ppi1, ppi2)
+			compare_time(ppi1, ppi2)
 struct procentry64 **ppi1;
 struct procentry64 **ppi2;
+
 {
 	register struct procentry64 *pi1 = *ppi1,
 			   *pi2 = *ppi2;
@@ -782,9 +790,10 @@ struct procentry64 **ppi2;
 /* compare_prio - the comparison function for sorting by cpu percentage */
 
 int
-compare_prio(ppi1, ppi2)
+			compare_prio(ppi1, ppi2)
 struct procentry64 **ppi1;
 struct procentry64 **ppi2;
+
 {
 	register struct procentry64 *pi1 = *ppi1,
 			   *pi2 = *ppi2;
@@ -803,8 +812,9 @@ struct procentry64 **ppi2;
 
 
 int
-proc_owner(pid)
+			proc_owner(pid)
 int			pid;
+
 {
 	register struct procentry64 **prefp = pref;
 	register int cnt = pref_len;
diff --git a/machine/m_common.c b/machine/m_common.c
index dd23627..8d478de 100644
--- a/machine/m_common.c
+++ b/machine/m_common.c
@@ -13,12 +13,12 @@
 
 #include "machine.h"
 
-char *backendstatenames[] =
+char	   *backendstatenames[] =
 {
 	"", "idle", "active", "idltxn", "fast", "abort", "disabl", NULL
 };
 
-char *procstatenames[] =
+char	   *procstatenames[] =
 {
 	"", " idle, ", " active, ", " idle txn, ", " fastpath, ", " aborted, ",
 	" disabled, ", NULL
diff --git a/machine/m_freebsd.c b/machine/m_freebsd.c
index a71baef..d67a748 100644
--- a/machine/m_freebsd.c
+++ b/machine/m_freebsd.c
@@ -55,20 +55,20 @@
 
 #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
 
-static int getkval __P((unsigned long, int *, int, char *));
+static int	getkval __P((unsigned long, int *, int, char *));
 extern char *printable __P((char *));
 static void getsysctl(const char *name, void *ptr, size_t len);
-int swapmode __P((int *retavail, int *retfree));
+int			swapmode __P((int *retavail, int *retfree));
 
-static int maxcpu;
+static int	maxcpu;
 static int	maxid;
-static int ncpus;
+static int	ncpus;
 static u_long cpumask;
 static long *times;
 static long *pcpu_cp_time;
 static long *pcpu_cp_old;
 static long *pcpu_cp_diff;
-static int64_t *pcpu_cpu_states;
+static int64_t * pcpu_cpu_states;
 
 static int	smpmode;
 static int	namelength;
@@ -79,7 +79,7 @@ static int	cmdlength;
 
 struct handle
 {
-	struct kinfo_proc **next_proc;		/* points to next valid proc pointer */
+	struct kinfo_proc **next_proc;	/* points to next valid proc pointer */
 	int			remaining;		/* number of pointers remaining */
 };
 
@@ -182,7 +182,7 @@ char	   *state_abbrev[] =
 };
 
 
-static kvm_t *kd;
+static kvm_t * kd;
 
 /* values that we stash away in _init and use in later routines */
 
@@ -197,7 +197,7 @@ static load_avg ccpu;
 static unsigned long cp_time_offset;
 static unsigned long avenrun_offset;
 static unsigned long lastpid_offset;
-static int lastpid;
+static int	lastpid;
 static unsigned long cnt_offset;
 static unsigned long bufspace_offset;
 
@@ -218,7 +218,7 @@ char	   *procstatenames[] = {
 
 /* these are for detailing the cpu states */
 
-int64_t			cpu_states[CPUSTATES];
+int64_t		cpu_states[CPUSTATES];
 char	   *cpustatenames[] = {
 	"user", "nice", "system", "interrupt", "idle", NULL
 };
@@ -267,26 +267,28 @@ int			proc_compare(), compare_size(), compare_res(), compare_time(), compare_pri
 int			(*proc_compares[]) () =
 {
 	proc_compare,
-	compare_size,
-	compare_res,
-	compare_time,
-	compare_prio,
-	NULL
+		compare_size,
+		compare_res,
+		compare_time,
+		compare_prio,
+		NULL
 };
 
 int
-machine_init(struct statics * statics)
+machine_init(struct statics *statics)
 
 {
 	register int pagesize;
 	size_t		size;
 	struct passwd *pw;
-	int i, j, empty;
+	int			i,
+				j,
+				empty;
 
 	size = sizeof(smpmode);
 	if ((sysctlbyname("machdep.smp_active", &smpmode, &size, NULL, 0) != 0 &&
-			sysctlbyname("smp.smp_active", &smpmode, &size, NULL, 0) != 0) ||
-			size != sizeof(smpmode))
+		 sysctlbyname("smp.smp_active", &smpmode, &size, NULL, 0) != 0) ||
+		size != sizeof(smpmode))
 		smpmode = 0;
 
 	while ((pw = getpwent()) != NULL)
@@ -358,13 +360,16 @@ machine_init(struct statics * statics)
 		err(1, "sysctlbyname kern.cp_times");
 	pcpu_cp_time = calloc(1, size);
 	maxid = (size / CPUSTATES / sizeof(long)) - 1;
-	for (i = 0; i <= maxid; i++) {
+	for (i = 0; i <= maxid; i++)
+	{
 		empty = 1;
-		for (j = 0; empty && j < CPUSTATES; j++) {
+		for (j = 0; empty && j < CPUSTATES; j++)
+		{
 			if (times[i * CPUSTATES + j] != 0)
 				empty = 0;
 		}
-		if (!empty) {
+		if (!empty)
+		{
 			cpumask |= (1ul << i);
 			ncpus++;
 		}
@@ -398,12 +403,13 @@ static int	swappgsout = -1;
 extern struct timeval timeout;
 
 void
-get_system_info(struct system_info * si)
+get_system_info(struct system_info *si)
 
 {
 	struct loadavg sysload;
 	size_t		size;
-	int			i, j;
+	int			i,
+				j;
 
 	/* get the CPU stats */
 	size = (maxid + 1) * CPUSTATES * sizeof(long);
@@ -415,16 +421,17 @@ get_system_info(struct system_info * si)
 
 	/* convert load averages to doubles */
 	for (i = 0; i < 3; i++)
-		si->load_avg[i] = (double)sysload.ldavg[i] / sysload.fscale;
+		si->load_avg[i] = (double) sysload.ldavg[i] / sysload.fscale;
 
 	/* convert cp_time counts to percentages */
-	for (i = j = 0; i <= maxid; i++) {
+	for (i = j = 0; i <= maxid; i++)
+	{
 		if ((cpumask & (1ul << i)) == 0)
 			continue;
 		percentages(CPUSTATES, &pcpu_cpu_states[j * CPUSTATES],
-				&pcpu_cp_time[j * CPUSTATES],
-				&pcpu_cp_old[j * CPUSTATES],
-				&pcpu_cp_diff[j * CPUSTATES]);
+					&pcpu_cp_time[j * CPUSTATES],
+					&pcpu_cp_old[j * CPUSTATES],
+					&pcpu_cp_diff[j * CPUSTATES]);
 		j++;
 	}
 	percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
@@ -435,13 +442,14 @@ get_system_info(struct system_info * si)
 		static int	swapavail = 0;
 		static int	swapfree = 0;
 		static int	bufspace = 0;
-		static int nspgsin, nspgsout;
+		static int	nspgsin,
+					nspgsout;
 
 		/*
 		 * Use this temporary int array because we use longs for the other
 		 * patforms.
 		 */
-		int tmp_memory_stats[7];
+		int			tmp_memory_stats[7];
 
 		GETSYSCTL("vfs.bufspace", bufspace);
 		GETSYSCTL("vm.stats.vm.v_active_count", tmp_memory_stats[0]);
@@ -510,8 +518,8 @@ static struct handle handle;
 static int	show_fullcmd;
 
 caddr_t
-get_process_info(struct system_info * si,
-				 struct process_select * sel,
+get_process_info(struct system_info *si,
+				 struct process_select *sel,
 				 int compare_index,
 				 const char *values[])
 
@@ -539,7 +547,7 @@ get_process_info(struct system_info * si,
 		nproc = PQntuples(pgresult);
 		if (nproc > onproc)
 			pbase = (struct kinfo_proc *)
-					realloc(pbase, sizeof(struct kinfo_proc) * nproc);
+				realloc(pbase, sizeof(struct kinfo_proc) * nproc);
 	}
 	PQfinish(pgconn);
 
@@ -856,7 +864,7 @@ static unsigned char sorted_state[] =
 /* compare_cpu - the comparison function for sorting by cpu percentage */
 
 int
-proc_compare(struct proc ** pp1, struct proc ** pp2)
+proc_compare(struct proc **pp1, struct proc **pp2)
 
 {
 	register struct kinfo_proc *p1;
@@ -882,7 +890,7 @@ proc_compare(struct proc ** pp1, struct proc ** pp2)
 /* compare_size - the comparison function for sorting by total memory usage */
 
 int
-compare_size(struct proc ** pp1, struct proc ** pp2)
+compare_size(struct proc **pp1, struct proc **pp2)
 
 {
 	register struct kinfo_proc *p1;
@@ -908,7 +916,7 @@ compare_size(struct proc ** pp1, struct proc ** pp2)
 /* compare_res - the comparison function for sorting by resident set size */
 
 int
-compare_res(struct proc ** pp1, struct proc ** pp2)
+compare_res(struct proc **pp1, struct proc **pp2)
 
 {
 	register struct kinfo_proc *p1;
@@ -934,7 +942,7 @@ compare_res(struct proc ** pp1, struct proc ** pp2)
 /* compare_time - the comparison function for sorting by total cpu time */
 
 int
-compare_time(struct proc ** pp1, struct proc ** pp2)
+compare_time(struct proc **pp1, struct proc **pp2)
 
 {
 	register struct kinfo_proc *p1;
@@ -960,7 +968,7 @@ compare_time(struct proc ** pp1, struct proc ** pp2)
 /* compare_prio - the comparison function for sorting by cpu percentage */
 
 int
-compare_prio(struct proc ** pp1, struct proc ** pp2)
+compare_prio(struct proc **pp1, struct proc **pp2)
 
 {
 	register struct kinfo_proc *p1;
@@ -1018,16 +1026,18 @@ proc_owner(pid_t pid)
 static void
 getsysctl(const char *name, void *ptr, size_t len)
 {
-	size_t nlen = len;
+	size_t		nlen = len;
 
-	if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) {
+	if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1)
+	{
 		fprintf(stderr, "pg_top: sysctl(%s...) failed: %s\n", name,
 				strerror(errno));
 		quit(23);
 	}
-	if (nlen != len) {
+	if (nlen != len)
+	{
 		fprintf(stderr, "pg_top: sysctl(%s...) expected %lu, got %lu\n",
-				name, (unsigned long)len, (unsigned long)nlen);
+				name, (unsigned long) len, (unsigned long) nlen);
 		quit(23);
 	}
 }
diff --git a/machine/m_linux.c b/machine/m_linux.c
index 8b02907..f64a8d3 100644
--- a/machine/m_linux.c
+++ b/machine/m_linux.c
@@ -79,7 +79,7 @@ struct top_proc
 	unsigned long size,
 				rss;			/* in k */
 	int			state;
-	int	    	pgstate;
+	int			pgstate;
 	unsigned long time;
 	unsigned long start_time;
 	unsigned long xtime;
@@ -88,39 +88,39 @@ struct top_proc
 	double		pcpu;
 
 	/* Data from /proc/<pid>/io. */
-	long long rchar;
-	long long wchar;
-	long long syscr;
-	long long syscw;
-	long long read_bytes;
-	long long write_bytes;
-	long long cancelled_write_bytes;
+	long long	rchar;
+	long long	wchar;
+	long long	syscr;
+	long long	syscw;
+	long long	read_bytes;
+	long long	write_bytes;
+	long long	cancelled_write_bytes;
 
 	/* The change in the previous values and current values. */
-	long long diff_rchar;
-	long long diff_wchar;
-	long long diff_syscr;
-	long long diff_syscw;
-	long long diff_read_bytes;
-	long long diff_write_bytes;
-	long long diff_cancelled_write_bytes;
+	long long	diff_rchar;
+	long long	diff_wchar;
+	long long	diff_syscr;
+	long long	diff_syscw;
+	long long	diff_read_bytes;
+	long long	diff_write_bytes;
+	long long	diff_cancelled_write_bytes;
 
 	/* Replication data */
-	char *application_name;
-	char *client_addr;
-	char *repstate;
-	char *primary;
-	char *sent;
-	char *write;
-	char *flush;
-	char *replay;
-	long long sent_lag;
-	long long write_lag;
-	long long flush_lag;
-	long long replay_lag;
+	char	   *application_name;
+	char	   *client_addr;
+	char	   *repstate;
+	char	   *primary;
+	char	   *sent;
+	char	   *write;
+	char	   *flush;
+	char	   *replay;
+	long long	sent_lag;
+	long long	write_lag;
+	long long	flush_lag;
+	long long	replay_lag;
 };
 
-int topproccmp(struct top_proc *, struct top_proc *);
+int			topproccmp(struct top_proc *, struct top_proc *);
 
 RB_HEAD(pgproc, top_proc) head_proc = RB_INITIALIZER(&head_proc);
 RB_PROTOTYPE(pgproc, top_proc, entry, topproccmp)
@@ -161,61 +161,61 @@ static char *swapnames[NSWAPSTATS + 1] =
 static char fmt_header[] =
 "  PID X         SIZE   RES STATE   XTIME  QTIME  %CPU LOCKS COMMAND";
 
-char fmt_header_io[] =
-		"  PID RCHAR WCHAR   SYSCR   SYSCW READS WRITES CWRITES COMMAND";
+char		fmt_header_io[] =
+"  PID RCHAR WCHAR   SYSCR   SYSCW READS WRITES CWRITES COMMAND";
 
-char fmt_header_replication[] =
-		"  PID USERNAME APPLICATION          CLIENT STATE     PRIMARY    SENT       WRITE      FLUSH      REPLAY      SLAG  WLAG  FLAG  RLAG";
+char		fmt_header_replication[] =
+"  PID USERNAME APPLICATION          CLIENT STATE     PRIMARY    SENT       WRITE      FLUSH      REPLAY      SLAG  WLAG  FLAG  RLAG";
 
 /* these are names given to allowed sorting orders -- first is default */
 static char *ordernames[] =
 {
-		"cpu", "size", "res", "xtime", "qtime", "rchar", "wchar", "syscr",
-		"syscw", "reads", "writes", "cwrites", "locks", "command", "flag",
-		"rlag", "slag", "wlag", NULL
+	"cpu", "size", "res", "xtime", "qtime", "rchar", "wchar", "syscr",
+	"syscw", "reads", "writes", "cwrites", "locks", "command", "flag",
+	"rlag", "slag", "wlag", NULL
 };
 
 /* forward definitions for comparison functions */
-static int compare_cmd(const void *, const void *);
-static int compare_cpu(const void *, const void *);
-static int compare_cwrites(const void *, const void *);
-static int compare_lag_flush(const void *, const void *);
-static int compare_lag_replay(const void *, const void *);
-static int compare_lag_sent(const void *, const void *);
-static int compare_lag_write(const void *, const void *);
-static int compare_locks(const void *, const void *);
-static int compare_qtime(const void *, const void *);
-static int compare_rchar(const void *, const void *);
-static int compare_reads(const void *, const void *);
-static int compare_res(const void *, const void *);
-static int compare_size(const void *, const void *);
-static int compare_syscr(const void *, const void *);
-static int compare_syscw(const void *, const void *);
-static int compare_wchar(const void *, const void *);
-static int compare_writes(const void *, const void *);
-static int compare_xtime(const void *, const void *);
+static int	compare_cmd(const void *, const void *);
+static int	compare_cpu(const void *, const void *);
+static int	compare_cwrites(const void *, const void *);
+static int	compare_lag_flush(const void *, const void *);
+static int	compare_lag_replay(const void *, const void *);
+static int	compare_lag_sent(const void *, const void *);
+static int	compare_lag_write(const void *, const void *);
+static int	compare_locks(const void *, const void *);
+static int	compare_qtime(const void *, const void *);
+static int	compare_rchar(const void *, const void *);
+static int	compare_reads(const void *, const void *);
+static int	compare_res(const void *, const void *);
+static int	compare_size(const void *, const void *);
+static int	compare_syscr(const void *, const void *);
+static int	compare_syscw(const void *, const void *);
+static int	compare_wchar(const void *, const void *);
+static int	compare_writes(const void *, const void *);
+static int	compare_xtime(const void *, const void *);
 
 int			(*proc_compares[]) () =
 {
 	compare_cpu,
-	compare_size,
-	compare_res,
-	compare_xtime,
-	compare_qtime,
-	compare_rchar,
-	compare_wchar,
-	compare_syscr,
-	compare_syscw,
-	compare_reads,
-	compare_writes,
-	compare_cwrites,
-	compare_locks,
-	compare_cmd,
-	compare_lag_flush,
-	compare_lag_replay,
-	compare_lag_sent,
-	compare_lag_write,
-	NULL
+		compare_size,
+		compare_res,
+		compare_xtime,
+		compare_qtime,
+		compare_rchar,
+		compare_wchar,
+		compare_syscr,
+		compare_syscw,
+		compare_reads,
+		compare_writes,
+		compare_cwrites,
+		compare_locks,
+		compare_cmd,
+		compare_lag_flush,
+		compare_lag_replay,
+		compare_lag_sent,
+		compare_lag_write,
+		NULL
 };
 
 /*=SYSTEM STATE INFO====================================================*/
@@ -235,12 +235,12 @@ static struct timeval lasttime;
 #define INITIAL_ACTIVE_SIZE  (256)
 #define PROCBLOCK_SIZE		 (32)
 static struct top_proc *pgtable;
-static int proc_index;
+static int	proc_index;
 static time_t boottime = -1;
 
 /* these are for passing data back to the machine independant portion */
 
-static int64_t	cpu_states[NCPUSTATES];
+static int64_t cpu_states[NCPUSTATES];
 static int	process_states[NPROCSTATES];
 static long memory_stats[NMEMSTATS];
 static long swap_stats[NSWAPSTATS];
@@ -289,8 +289,7 @@ xfrm_cmdline(char *p, int len)
 }
 
 int
-machine_init(struct statics * statics)
-
+machine_init(struct statics *statics)
 {
 	/* make sure the proc filesystem is mounted */
 	{
@@ -377,10 +376,8 @@ machine_init(struct statics * statics)
 	return 0;
 }
 
-
 void
-get_system_info(struct system_info * info)
-
+get_system_info(struct system_info *info)
 {
 	char		buffer[4096 + 1];
 	int			fd,
@@ -417,7 +414,7 @@ get_system_info(struct system_info * info)
 		if ((len = read(fd, buffer, sizeof(buffer) - 1)) > 0)
 		{
 			buffer[len] = '\0';
-			p = skip_token(buffer);		/* "cpu" */
+			p = skip_token(buffer); /* "cpu" */
 			cp_time[0] = strtoul(p, &p, 0);
 			cp_time[1] = strtoul(p, &p, 0);
 			cp_time[2] = strtoul(p, &p, 0);
@@ -469,7 +466,7 @@ get_system_info(struct system_info * info)
 					memory_stats[MEMFREE] = bytetok(memory_stats[MEMFREE]);
 					memory_stats[MEMSHARED] = bytetok(memory_stats[MEMSHARED]);
 					memory_stats[MEMBUFFERS] =
-							bytetok(memory_stats[MEMBUFFERS]);
+						bytetok(memory_stats[MEMBUFFERS]);
 					memory_stats[MEMCACHED] = bytetok(memory_stats[MEMCACHED]);
 					mem = 1;
 				}
@@ -541,7 +538,6 @@ get_system_info(struct system_info * info)
 	info->swap = swap_stats;
 }
 
-
 static void
 read_one_proc_stat(struct top_proc *proc, struct process_select *sel)
 {
@@ -553,7 +549,7 @@ read_one_proc_stat(struct top_proc *proc, struct process_select *sel)
 	int			fullcmd;
 	char		value[BUFFERLEN + 1];
 
-	long long tmp;
+	long long	tmp;
 
 	/* if anything goes wrong, we return with proc->state == 0 */
 	proc->state = 0;
@@ -662,11 +658,10 @@ read_one_proc_stat(struct top_proc *proc, struct process_select *sel)
 	p = skip_token(p);			/* skip nice */
 	p = skip_token(p);			/* skip num_threads */
 	p = skip_token(p);			/* skip itrealvalue, 0 */
-	proc->start_time = strtoul(p, &p, 10);		/* start_time */
+	proc->start_time = strtoul(p, &p, 10);	/* start_time */
 	proc->size = bytetok(strtoul(p, &p, 10));	/* vsize */
 	proc->rss = pagetok(strtoul(p, &p, 10));	/* rss */
 
-
 #if 0
 	/* for the record, here are the rest of the fields */
 	p = skip_token(p);			/* skip rlim */
@@ -695,8 +690,8 @@ read_one_proc_stat(struct top_proc *proc, struct process_select *sel)
 	{
 		/*
 		 * CONFIG_TASK_IO_ACCOUNTING is not enabled in the Linux kernel or
-		 * this version of Linux may not support collecting i/o statistics
-		 * per pid.  Report 0's.
+		 * this version of Linux may not support collecting i/o statistics per
+		 * pid.  Report 0's.
 		 */
 		proc->rchar = 0;
 		proc->wchar = 0;
@@ -713,39 +708,38 @@ read_one_proc_stat(struct top_proc *proc, struct process_select *sel)
 	buffer[len] = '\0';
 	p = buffer;
 
-	GET_VALUE(tmp);			/* rchar */
+	GET_VALUE(tmp);				/* rchar */
 	proc->diff_rchar = tmp - proc->rchar;
 	proc->rchar = tmp;
 
-	GET_VALUE(tmp);			/* wchar */
+	GET_VALUE(tmp);				/* wchar */
 	proc->diff_wchar = tmp - proc->wchar;
 	proc->wchar = tmp;
 
-	GET_VALUE(tmp);			/* syscr */
+	GET_VALUE(tmp);				/* syscr */
 	proc->diff_syscr = tmp - proc->syscr;
 	proc->syscr = tmp;
 
-	GET_VALUE(tmp);			/* syscw */
+	GET_VALUE(tmp);				/* syscw */
 	proc->diff_syscw = tmp - proc->syscw;
 	proc->syscw = tmp;
 
-	GET_VALUE(tmp);			/* read_bytes */
+	GET_VALUE(tmp);				/* read_bytes */
 	proc->diff_read_bytes = tmp - proc->read_bytes;
 	proc->read_bytes = tmp;
 
-	GET_VALUE(tmp); 			/* write_bytes */
+	GET_VALUE(tmp);				/* write_bytes */
 	proc->diff_write_bytes = tmp - proc->write_bytes;
 	proc->write_bytes = tmp;
 
-	GET_VALUE(tmp); 			/* cancelled_write_bytes */
+	GET_VALUE(tmp);				/* cancelled_write_bytes */
 	proc->diff_cancelled_write_bytes = tmp - proc->cancelled_write_bytes;
 	proc->cancelled_write_bytes = tmp;
 }
 
-
 caddr_t
-get_process_info(struct system_info * si,
-				 struct process_select * sel,
+get_process_info(struct system_info *si,
+				 struct process_select *sel,
 				 int compare_index, struct pg_conninfo_ctx *conninfo, int mode)
 {
 	struct timeval thistime;
@@ -777,16 +771,20 @@ get_process_info(struct system_info * si,
 		int			rows;
 		PGresult   *pgresult = NULL;
 
-		struct top_proc *n, *p;
+		struct top_proc *n,
+				   *p;
 
 		memset(process_states, 0, sizeof(process_states));
 
 		connect_to_db(conninfo);
 		if (conninfo->connection != NULL)
 		{
-			if (mode == MODE_REPLICATION) {
+			if (mode == MODE_REPLICATION)
+			{
 				pgresult = pg_replication(conninfo->connection);
-			} else {
+			}
+			else
+			{
 				pgresult = pg_processes(conninfo->connection);
 			}
 			rows = PQntuples(pgresult);
@@ -796,9 +794,11 @@ get_process_info(struct system_info * si,
 			rows = 0;
 		}
 
-		if (rows > 0) {
+		if (rows > 0)
+		{
 			p = reallocarray(pgtable, rows, sizeof(struct top_proc));
-			if (p == NULL) {
+			if (p == NULL)
+			{
 				fprintf(stderr, "reallocarray error\n");
 				if (pgresult != NULL)
 					PQclear(pgresult);
@@ -813,7 +813,8 @@ get_process_info(struct system_info * si,
 			unsigned long otime;
 
 			n = malloc(sizeof(struct top_proc));
-			if (n == NULL) {
+			if (n == NULL)
+			{
 				fprintf(stderr, "malloc error\n");
 				if (pgresult != NULL)
 					PQclear(pgresult);
@@ -878,10 +879,10 @@ get_process_info(struct system_info * si,
 				}
 
 				if ((show_idle || n->pgstate != STATE_IDLE) &&
-						(sel->usename[0] == '\0' ||
-								strcmp(n->usename, sel->usename) == 0))
+					(sel->usename[0] == '\0' ||
+					 strcmp(n->usename, sel->usename) == 0))
 					memcpy(&pgtable[active_procs++], n,
-							sizeof(struct top_proc));
+						   sizeof(struct top_proc));
 			}
 			total_procs++;
 		}
@@ -898,7 +899,7 @@ get_process_info(struct system_info * si,
 	if (compare_index >= 0 && si->p_active)
 	{
 		qsort(pgtable, si->p_active, sizeof(struct top_proc),
-				proc_compares[compare_index]);
+			  proc_compares[compare_index]);
 	}
 
 	/* don't even pretend that the return value thing here isn't bogus */
@@ -906,10 +907,8 @@ get_process_info(struct system_info * si,
 	return (caddr_t) 0;
 }
 
-
 char *
 format_header(char *uname_field)
-
 {
 	int			uname_len = strlen(uname_field);
 
@@ -921,7 +920,6 @@ format_header(char *uname_field)
 	return fmt_header;
 }
 
-
 char *
 format_next_io(caddr_t handle)
 {
@@ -931,30 +929,30 @@ format_next_io(caddr_t handle)
 	if (mode_stats == STATS_DIFF)
 	{
 		snprintf(fmt, sizeof(fmt),
-				"%5d %5s %5s %7lld %7lld %5s %6s %7s %s",
-				p->pid,
-				format_b(p->diff_rchar),
-				format_b(p->diff_wchar),
-				p->diff_syscr,
-				p->diff_syscw,
-				format_b(p->diff_read_bytes),
-				format_b(p->diff_write_bytes),
-				format_b(p->diff_cancelled_write_bytes),
-				p->name);
+				 "%5d %5s %5s %7lld %7lld %5s %6s %7s %s",
+				 p->pid,
+				 format_b(p->diff_rchar),
+				 format_b(p->diff_wchar),
+				 p->diff_syscr,
+				 p->diff_syscw,
+				 format_b(p->diff_read_bytes),
+				 format_b(p->diff_write_bytes),
+				 format_b(p->diff_cancelled_write_bytes),
+				 p->name);
 	}
 	else
 	{
 		snprintf(fmt, sizeof(fmt),
-				"%5d %5s %5s %7lld %7lld %5s %6s %7s %s",
-				p->pid,
-				format_b(p->rchar),
-				format_b(p->wchar),
-				p->syscr,
-				p->syscw,
-				format_b(p->read_bytes),
-				format_b(p->write_bytes),
-				format_b(p->cancelled_write_bytes),
-				p->name);
+				 "%5d %5s %5s %7lld %7lld %5s %6s %7s %s",
+				 p->pid,
+				 format_b(p->rchar),
+				 format_b(p->wchar),
+				 p->syscr,
+				 p->syscw,
+				 format_b(p->read_bytes),
+				 format_b(p->write_bytes),
+				 format_b(p->cancelled_write_bytes),
+				 p->name);
 	}
 
 	return (fmt);
@@ -1051,7 +1049,6 @@ format_next_replication(caddr_t handle)
 #define ORDERKEY_WRITES  if ((result = p1->write_bytes - p2->write_bytes) == 0)
 #define ORDERKEY_XTIME   if ((result = p2->xtime - p1->xtime) == 0)
 
-
 /* compare_cmd - the comparison function for sorting by command name */
 
 static int
@@ -1059,7 +1056,7 @@ compare_cmd(const void *v1, const void *v2)
 {
 	struct top_proc *p1 = (struct top_proc *) v1;
 	struct top_proc *p2 = (struct top_proc *) v2;
-	int result;
+	int			result;
 
 	ORDERKEY_NAME
 		ORDERKEY_PCTCPU
@@ -1078,7 +1075,8 @@