From d3352b997ca59a336a40fe6660c6e5b7079864aa Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Sun, 28 Jun 2020 14:58:32 +0200
Subject: Run clang-format on source tree (excl igmp.c)

---
 minecproxy/ptimer.c | 59 +++++++++++++++++++----------------------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

(limited to 'minecproxy/ptimer.c')

diff --git a/minecproxy/ptimer.c b/minecproxy/ptimer.c
index 845fbfa..6ed405d 100644
--- a/minecproxy/ptimer.c
+++ b/minecproxy/ptimer.c
@@ -16,18 +16,11 @@ struct ptimer {
 	struct list_head ptasks;
 };
 
-static void
-ptimer_set(unsigned value, unsigned interval)
+static void ptimer_set(unsigned value, unsigned interval)
 {
 	struct itimerspec tspec = {
-		.it_interval = {
-			.tv_sec  = interval,
-			.tv_nsec = 0
-		},
-		.it_value = {
-			.tv_sec  = value,
-			.tv_nsec = 0
-		}
+		.it_interval = { .tv_sec = interval, .tv_nsec = 0 },
+		.it_value = { .tv_sec = value, .tv_nsec = 0 }
 	};
 
 	assert_return(cfg->ptimer && cfg->ptimer->task.fd >= 0);
@@ -36,16 +29,14 @@ ptimer_set(unsigned value, unsigned interval)
 		error("timerfd_settime: %m");
 }
 
-static unsigned
-gcd(unsigned a, unsigned b)
+static unsigned gcd(unsigned a, unsigned b)
 {
 	if (a == 0)
 		return b;
 	return gcd(b % a, a);
 }
 
-static unsigned
-array_gcd(unsigned arr[], unsigned n)
+static unsigned array_gcd(unsigned arr[], unsigned n)
 {
 	unsigned result = arr[0];
 
@@ -55,8 +46,7 @@ array_gcd(unsigned arr[], unsigned n)
 	return result;
 }
 
-static void
-ptimer_tick(struct ptimer *ptimer)
+static void ptimer_tick(struct ptimer *ptimer)
 {
 	time_t now = time(NULL);
 	unsigned diff = (unsigned)(now - ptimer->previous_time);
@@ -69,8 +59,8 @@ ptimer_tick(struct ptimer *ptimer)
 			continue;
 		}
 
-		debug(DBG_TIMER, "triggering ptask %p (times %u)",
-		      ptask, ptask->times);
+		debug(DBG_TIMER, "triggering ptask %p (times %u)", ptask,
+		      ptask->times);
 
 		ptask->cb(ptask);
 		ptask->remain = ptask->interval;
@@ -88,8 +78,7 @@ ptimer_tick(struct ptimer *ptimer)
 	ptimer->previous_time = now;
 }
 
-static void
-ptimer_reconfig(struct ptimer *ptimer)
+static void ptimer_reconfig(struct ptimer *ptimer)
 {
 	struct ptimer_task *ptask;
 	unsigned i = 0;
@@ -116,8 +105,7 @@ ptimer_reconfig(struct ptimer *ptimer)
 	ptimer_set(lowest, interval);
 }
 
-void
-ptimer_del_task(struct ptimer_task *ptask)
+void ptimer_del_task(struct ptimer_task *ptask)
 {
 	struct ptimer *ptimer = cfg->ptimer;
 
@@ -133,8 +121,7 @@ ptimer_del_task(struct ptimer_task *ptask)
 	uring_task_put(&ptimer->task);
 }
 
-void
-ptimer_add_task(struct ptimer_task *ptask)
+void ptimer_add_task(struct ptimer_task *ptask)
 {
 	struct ptimer *ptimer = cfg->ptimer;
 
@@ -150,16 +137,14 @@ ptimer_add_task(struct ptimer_task *ptask)
 	ptimer_reconfig(ptimer);
 }
 
-void
-ptimer_refdump()
+void ptimer_refdump()
 {
 	assert_return(cfg->ptimer);
 
 	uring_task_refdump(&cfg->ptimer->task);
 }
 
-static void
-ptimer_free(struct uring_task *task)
+static void ptimer_free(struct uring_task *task)
 {
 	struct ptimer *ptimer = container_of(task, struct ptimer, task);
 
@@ -170,8 +155,7 @@ ptimer_free(struct uring_task *task)
 	cfg->ptimer = NULL;
 }
 
-void
-ptimer_delete()
+void ptimer_delete()
 {
 	assert_return(cfg->ptimer);
 
@@ -179,8 +163,7 @@ ptimer_delete()
 	uring_task_destroy(&cfg->ptimer->task);
 }
 
-static void
-ptimer_cb(struct uring_task *task, int res)
+static void ptimer_cb(struct uring_task *task, int res)
 {
 	struct ptimer *ptimer = container_of(task, struct ptimer, task);
 
@@ -193,15 +176,15 @@ ptimer_cb(struct uring_task *task, int res)
 	}
 
 	ptimer_tick(ptimer);
-	uring_read(&ptimer->task, &ptimer->value, sizeof(ptimer->value), ptimer_cb);
+	uring_read(&ptimer->task, &ptimer->value, sizeof(ptimer->value),
+		   ptimer_cb);
 }
 
-void
-ptimer_init()
+void ptimer_init()
 {
 	struct ptimer *ptimer;
 	int tfd;
- 
+
 	assert_return(!cfg->ptimer);
 
 	ptimer = zmalloc(sizeof(*ptimer));
@@ -218,6 +201,6 @@ ptimer_init()
 	uring_task_init(&ptimer->task, "ptimer", uring_parent(), ptimer_free);
 	uring_task_set_fd(&ptimer->task, tfd);
 	cfg->ptimer = ptimer;
-	uring_read(&ptimer->task, &ptimer->value, sizeof(ptimer->value), ptimer_cb);
+	uring_read(&ptimer->task, &ptimer->value, sizeof(ptimer->value),
+		   ptimer_cb);
 }
-
-- 
cgit v1.2.3