From ff4f4da60898e269b4ca14bd6772adab94a60e08 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Mon, 7 Mar 2016 15:19:00 -0800
Subject: [PATCH] deheader cleanup

---
 adsbus/adsbus.c        |  1 -
 adsbus/airspy_adsb.c   |  2 --
 adsbus/asyncaddrinfo.c |  3 ++-
 adsbus/beast.c         |  1 -
 adsbus/exec.c          |  4 +---
 adsbus/file.c          |  4 ----
 adsbus/incoming.c      |  3 +--
 adsbus/json.c          |  8 ++++----
 adsbus/list.c          |  2 --
 adsbus/list.h          |  5 ++---
 adsbus/opts.c          |  2 --
 adsbus/outgoing.c      |  5 ++---
 adsbus/peer.c          |  4 +---
 adsbus/proto.c         | 10 ++++------
 adsbus/raw.c           |  2 --
 adsbus/receive.c       |  4 +---
 adsbus/resolve.c       |  2 --
 adsbus/send.c          |  3 ---
 adsbus/send_receive.c  |  3 ---
 adsbus/socket.c        |  3 ++-
 adsbus/uuid.c          |  2 --
 adsbus/wakeup.c        |  7 -------
 22 files changed, 20 insertions(+), 60 deletions(-)

diff --git a/adsbus/adsbus.c b/adsbus/adsbus.c
index fbe0895..decf416 100644
--- a/adsbus/adsbus.c
+++ b/adsbus/adsbus.c
@@ -3,7 +3,6 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/adsbus/airspy_adsb.c b/adsbus/airspy_adsb.c
index af8460e..876bbc1 100644
--- a/adsbus/airspy_adsb.c
+++ b/adsbus/airspy_adsb.c
@@ -1,11 +1,9 @@
 #include <assert.h>
-#include <string.h>
 
 #include "buf.h"
 #include "hex.h"
 #include "packet.h"
 #include "receive.h"
-#include "uuid.h"
 
 #include "airspy_adsb.h"
 
diff --git a/adsbus/asyncaddrinfo.c b/adsbus/asyncaddrinfo.c
index c2578c4..c8a8b23 100644
--- a/adsbus/asyncaddrinfo.c
+++ b/adsbus/asyncaddrinfo.c
@@ -4,8 +4,9 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "asyncaddrinfo.h"
diff --git a/adsbus/beast.c b/adsbus/beast.c
index 700adc0..31c2846 100644
--- a/adsbus/beast.c
+++ b/adsbus/beast.c
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "buf.h"
 #include "packet.h"
diff --git a/adsbus/exec.c b/adsbus/exec.c
index 59c77d9..192cc51 100644
--- a/adsbus/exec.c
+++ b/adsbus/exec.c
@@ -1,16 +1,14 @@
 #include <assert.h>
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "buf.h"
 #include "flow.h"
-#include "list.h"
 #include "log.h"
 #include "peer.h"
 #include "uuid.h"
diff --git a/adsbus/file.c b/adsbus/file.c
index 9af060e..061932c 100644
--- a/adsbus/file.c
+++ b/adsbus/file.c
@@ -3,17 +3,13 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/epoll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "flow.h"
-#include "list.h"
 #include "log.h"
 #include "peer.h"
-#include "receive.h"
-#include "send.h"
 #include "uuid.h"
 #include "wakeup.h"
 
diff --git a/adsbus/incoming.c b/adsbus/incoming.c
index c2c3dff..41144c0 100644
--- a/adsbus/incoming.c
+++ b/adsbus/incoming.c
@@ -5,11 +5,10 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
-#include "buf.h"
 #include "flow.h"
-#include "list.h"
 #include "log.h"
 #include "peer.h"
 #include "resolve.h"
diff --git a/adsbus/json.c b/adsbus/json.c
index fb2bfa1..0200951 100644
--- a/adsbus/json.c
+++ b/adsbus/json.c
@@ -1,15 +1,15 @@
 #include <assert.h>
+#include <stdbool.h>
 #include <string.h>
 #include <jansson.h>
 
 #include "hex.h"
 #include "buf.h"
+#include "log.h"
 #include "packet.h"
 #include "rand.h"
 #include "receive.h"
-#include "send.h"
 #include "server.h"
-#include "uuid.h"
 
 #include "json.h"
 
@@ -79,11 +79,11 @@ static bool json_parse_header(json_t *in, struct packet *packet, struct json_par
 	}
 
 	if (!strcmp(json_server_id, (const char *) server_id)) {
-		fprintf(stderr, "R %s: Attempt to receive json data from our own server ID (%s); loop!\n", packet->source_id, server_id);
+		log_write('R', packet->source_id, "Attempt to receive json data from our own server ID (%s); loop!", server_id);
 		return false;
 	}
 
-	fprintf(stderr, "R %s: Connected to server ID: %s\n", packet->source_id, json_server_id);
+	log_write('R', packet->source_id, "Connected to server ID: %s", json_server_id);
 
 	state->mlat_timestamp_mhz = (uint16_t) mlat_timestamp_mhz;
 	state->mlat_timestamp_max = (uint64_t) mlat_timestamp_max;
diff --git a/adsbus/list.c b/adsbus/list.c
index f8c2873..e37101b 100644
--- a/adsbus/list.c
+++ b/adsbus/list.c
@@ -1,5 +1,3 @@
-#include <stdlib.h>
-
 #include "list.h"
 
 void list_head_init(struct list_head *head) {
diff --git a/adsbus/list.h b/adsbus/list.h
index fb9af51..c4f4433 100644
--- a/adsbus/list.h
+++ b/adsbus/list.h
@@ -1,16 +1,15 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #pragma GCC diagnostic ignored "-Wcast-align"
 #pragma GCC diagnostic ignored "-Wgnu-statement-expression"
 #pragma GCC diagnostic ignored "-Wlanguage-extension-token"
 
-#define offset_of(type, member) ((size_t) &((type *) NULL)->member)
-
 #define container_of(ptr, type, member) ({ \
 		typeof( ((type *) NULL)->member ) *__mptr = (ptr); \
-		(type *)( (char *)__mptr - offset_of(type, member) );})
+		(type *)( (char *)__mptr - offsetof(type, member) );})
 
 struct list_head {
 	struct list_head *next;
diff --git a/adsbus/opts.c b/adsbus/opts.c
index 22f855e..822fa5f 100644
--- a/adsbus/opts.c
+++ b/adsbus/opts.c
@@ -2,8 +2,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "exec.h"
diff --git a/adsbus/outgoing.c b/adsbus/outgoing.c
index 20c47fc..b9bd9c3 100644
--- a/adsbus/outgoing.c
+++ b/adsbus/outgoing.c
@@ -3,17 +3,16 @@
 #include <netdb.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "buf.h"
 #include "flow.h"
-#include "list.h"
 #include "log.h"
 #include "peer.h"
 #include "resolve.h"
-#include "socket.h"
 #include "wakeup.h"
 #include "uuid.h"
 
diff --git a/adsbus/peer.c b/adsbus/peer.c
index f7a5961..c6e6b11 100644
--- a/adsbus/peer.c
+++ b/adsbus/peer.c
@@ -1,17 +1,15 @@
 #include <assert.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/epoll.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "log.h"
 #include "server.h"
-#include "uuid.h"
 #include "wakeup.h"
 
 #include "peer.h"
diff --git a/adsbus/proto.c b/adsbus/proto.c
index 578d4d9..be7dcb8 100644
--- a/adsbus/proto.c
+++ b/adsbus/proto.c
@@ -1,19 +1,17 @@
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wpacked"
-
-#include <arpa/inet.h>
-#include <assert.h>
+#include <stdbool.h>
 #include <string.h>
 
 #include "buf.h"
 #include "log.h"
 #include "packet.h"
 #include "server.h"
-#include "uuid.h"
 
 #include "adsb.pb-c.h"
 #include "proto.h"
 
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#pragma GCC diagnostic ignored "-Wpacked"
+
 #define PROTO_MAGIC "aDsB"
 
 struct proto_parser_state {
diff --git a/adsbus/raw.c b/adsbus/raw.c
index f721d66..b176b06 100644
--- a/adsbus/raw.c
+++ b/adsbus/raw.c
@@ -1,10 +1,8 @@
 #include <assert.h>
-#include <string.h>
 
 #include "buf.h"
 #include "hex.h"
 #include "packet.h"
-#include "uuid.h"
 
 #include "raw.h"
 
diff --git a/adsbus/receive.c b/adsbus/receive.c
index ed42cc5..6e087ed 100644
--- a/adsbus/receive.c
+++ b/adsbus/receive.c
@@ -1,10 +1,9 @@
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "airspy_adsb.h"
@@ -12,7 +11,6 @@
 #include "buf.h"
 #include "flow.h"
 #include "json.h"
-#include "list.h"
 #include "log.h"
 #include "packet.h"
 #include "peer.h"
diff --git a/adsbus/resolve.c b/adsbus/resolve.c
index 35d4864..57f05c6 100644
--- a/adsbus/resolve.c
+++ b/adsbus/resolve.c
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 
 #include "asyncaddrinfo.h"
diff --git a/adsbus/send.c b/adsbus/send.c
index 121e936..c8f2ff1 100644
--- a/adsbus/send.c
+++ b/adsbus/send.c
@@ -1,7 +1,5 @@
 #include <assert.h>
-#include <errno.h>
 #include <signal.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -15,7 +13,6 @@
 #include "buf.h"
 #include "flow.h"
 #include "json.h"
-#include "list.h"
 #include "log.h"
 #include "packet.h"
 #include "peer.h"
diff --git a/adsbus/send_receive.c b/adsbus/send_receive.c
index fce20eb..408b600 100644
--- a/adsbus/send_receive.c
+++ b/adsbus/send_receive.c
@@ -1,11 +1,8 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "flow.h"
-#include "list.h"
-#include "log.h"
 #include "peer.h"
 #include "receive.h"
 #include "send.h"
diff --git a/adsbus/socket.c b/adsbus/socket.c
index 207460e..7782ded 100644
--- a/adsbus/socket.c
+++ b/adsbus/socket.c
@@ -2,8 +2,9 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "socket.h"
 
diff --git a/adsbus/uuid.c b/adsbus/uuid.c
index 792bf49..b5c0bca 100644
--- a/adsbus/uuid.c
+++ b/adsbus/uuid.c
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
 #include "hex.h"
 #include "rand.h"
 
diff --git a/adsbus/wakeup.c b/adsbus/wakeup.c
index 73218f0..5360a27 100644
--- a/adsbus/wakeup.c
+++ b/adsbus/wakeup.c
@@ -1,15 +1,8 @@
 #include <assert.h>
-#include <fcntl.h>
-#include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/epoll.h>
 #include <time.h>
-#include <unistd.h>
 
-#include "list.h"
 #include "peer.h"
 #include "rand.h"