diff --git a/lib/extension.c b/lib/extension.c
index 8388da30..c94628a6 100644
--- a/lib/extension.c
+++ b/lib/extension.c
@@ -43,8 +43,8 @@ LWS_VISIBLE struct lws_extension *lws_get_internal_extensions()
 
 /* 0 = nobody had nonzero return, 1 = somebody had positive return, -1 = fail */
 
-int lws_ext_callback_for_each_active(struct lws *wsi, int reason,
-				void *arg, int len)
+int lws_ext_callback_for_each_active(struct lws *wsi, int reason, void *arg,
+				     int len)
 {
 	int n, m, handled = 0;
 
@@ -77,7 +77,7 @@ int lws_ext_callback_for_each_extension_type(
 
 	while (ext && ext->callback && !handled) {
 		m = ext->callback(context, ext, wsi, reason,
-						(void *)(long)n, arg, len);
+				  (void *)(long)n, arg, len);
 		if (m < 0) {
 			lwsl_ext(
 			 "Extension '%s' failed to handle callback %d!\n",
@@ -95,8 +95,7 @@ int lws_ext_callback_for_each_extension_type(
 }
 
 int
-lws_issue_raw_ext_access(struct lws *wsi,
-						 unsigned char *buf, size_t len)
+lws_issue_raw_ext_access(struct lws *wsi, unsigned char *buf, size_t len)
 {
 	int ret;
 	struct lws_tokens eff_buf;
@@ -186,7 +185,7 @@ lws_issue_raw_ext_access(struct lws *wsi,
 int
 lws_any_extension_handled(struct lws *wsi,
 			  enum lws_extension_callback_reasons r,
-						       void *v, size_t len)
+			  void *v, size_t len)
 {
 	int n;
 	int handled = 0;
diff --git a/test-server/test-ping.c b/test-server/test-ping.c
index ebc62c00..9681fb51 100644
--- a/test-server/test-ping.c
+++ b/test-server/test-ping.c
@@ -54,7 +54,7 @@ static unsigned int size = 64;
 static int flood;
 static const char *address;
 static unsigned char pingbuf[LWS_SEND_BUFFER_PRE_PADDING + MAX_MIRROR_PAYLOAD +
-						  LWS_SEND_BUFFER_POST_PADDING];
+			     LWS_SEND_BUFFER_POST_PADDING];
 static char peer_name[128];
 static unsigned long started;
 static int screen_width = 80;
@@ -103,18 +103,17 @@ static int
 callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
 		    void *user, void *in, size_t len)
 {
+	struct per_session_data__ping *psd = user;
 	struct timeval tv;
 	unsigned char *p;
-	int shift;
-	uint64_t l;
 	unsigned long iv;
-	int n;
 	int match = 0;
-	struct per_session_data__ping *psd = user;
+	uint64_t l;
+	int shift;
+	int n;
 
 	switch (reason) {
 	case LWS_CALLBACK_CLOSED:
-
 		fprintf(stderr, "LWS_CALLBACK_CLOSED on %p\n", (void *)wsi);
 
 		/* remove closed guy */