From 34ddebc84cb9ea933cfdb9cc3fa688b6a2fae78e Mon Sep 17 00:00:00 2001
From: Sebastian
Date: Wed, 10 Feb 2016 21:14:40 +0100
Subject: cleanup commits

---
 .gitignore              |  2 +-
 src/client/client.c     |  7 +++----
 src/fuse/helper.c       |  3 ---
 src/fuse/helper.h       |  5 ++---
 src/fuse/main.c         |  6 +-----
 src/serialize.c         |  2 +-
 src/server/altservers.c | 12 ------------
 src/server/fileutil.c   |  4 ++--
 src/server/globals.c    |  2 --
 src/server/helper.c     |  4 ----
 src/server/helper.h     |  2 +-
 src/server/image.h      |  5 ++---
 src/server/ini.c        |  5 ++---
 src/server/integrity.c  | 12 ++----------
 src/server/locks.c      | 12 +-----------
 src/server/locks.h      |  5 ++---
 src/server/net.c        | 28 +++++++---------------------
 src/server/rpc.c        | 11 ++---------
 src/server/server.c     | 28 ++++++++++------------------
 src/server/server.h     |  8 ++++----
 src/server/threadpool.c |  6 +-----
 src/server/uplink.c     | 14 ++------------
 src/server/uplink.h     |  2 +-
 src/shared/log.c        |  4 ----
 src/shared/sockhelper.c |  3 ---
 src/shared/sockhelper.h |  2 +-
 26 files changed, 48 insertions(+), 146 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97b41dc..99e89ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ build/
 .project
 *.swp
 .autotools
-
+.idea
\ No newline at end of file
diff --git a/src/client/client.c b/src/client/client.c
index b3069fe..06f6e23 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -18,6 +18,9 @@
  *
  */
 
+#include "../types.h"
+#include "../version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -28,13 +31,9 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <errno.h>
-#include "../types.h"
-#include "../version.h"
 
 #define SOCK_PATH "/var/run/dnbd3.socket"
 #define SOCK_BUFFER 1000
diff --git a/src/fuse/helper.c b/src/fuse/helper.c
index 853b021..d81b08f 100644
--- a/src/fuse/helper.c
+++ b/src/fuse/helper.c
@@ -1,10 +1,7 @@
 #include "helper.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <inttypes.h>
 
 
diff --git a/src/fuse/helper.h b/src/fuse/helper.h
index c0c70c7..94218a9 100644
--- a/src/fuse/helper.h
+++ b/src/fuse/helper.h
@@ -1,14 +1,13 @@
 #ifndef IMAGEHELPER_H
 #define IMAGEHELPER_H
 
+#include "../types.h"
+
 #include <netdb.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "../types.h"
-
-
 typedef struct log_info {
 	uint64_t imageSize;
 	uint64_t receivedBytes;
diff --git a/src/fuse/main.c b/src/fuse/main.c
index 8c3e0d3..2c349c8 100644
--- a/src/fuse/main.c
+++ b/src/fuse/main.c
@@ -7,18 +7,14 @@
  * Changed by Stephan Schwaer
  * */
 
-#include "../shared/protocol.h"
-#include "../shared/fdsignal.h"
 #include "connection.h"
-#include "../serialize.h"
 #include "helper.h"
+#include "../shared/protocol.h"
 #include "../shared/log.h"
 
 #define FUSE_USE_VERSION 30
 #include <fuse.h>
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 /* for printing uint */
diff --git a/src/serialize.c b/src/serialize.c
index 409b682..1714ae9 100644
--- a/src/serialize.c
+++ b/src/serialize.c
@@ -1,6 +1,6 @@
 #include "serialize.h"
 #include "types.h"
-
+#include <stdint.h>
 
 
 void serializer_reset_read(serialized_buffer_t *buffer, size_t data_len)
diff --git a/src/server/altservers.c b/src/server/altservers.c
index e58d120..41c0a27 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -1,22 +1,10 @@
 #include "altservers.h"
-#include "uplink.h"
 #include "locks.h"
-#include "../shared/sockhelper.h"
-#include "../shared/log.h"
 #include "helper.h"
-#include "globals.h"
 #include "image.h"
-#include "../shared/fdsignal.h"
-#include "../shared/log.h"
 #include "../shared/protocol.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/errno.h>
-#include <math.h>
 #include <assert.h>
 #include <inttypes.h>
-#include <time.h>
-#include <stdio.h>
 
 static dnbd3_connection_t *pending[SERVER_MAX_PENDING_ALT_CHECKS];
 static pthread_spinlock_t pendingLockWrite; // Lock for adding something to pending. (NULL -> nonNULL)
diff --git a/src/server/fileutil.c b/src/server/fileutil.c
index 4aaced4..f09a899 100644
--- a/src/server/fileutil.c
+++ b/src/server/fileutil.c
@@ -1,14 +1,14 @@
 #include "fileutil.h"
 
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/statvfs.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
 
 bool file_isReadable(char *file)
 {
diff --git a/src/server/globals.c b/src/server/globals.c
index 5a7de89..af4cfea 100644
--- a/src/server/globals.c
+++ b/src/server/globals.c
@@ -1,8 +1,6 @@
 #include "globals.h"
 #include "ini.h"
 #include "../shared/log.h"
-#include "../types.h"
-#include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/server/helper.c b/src/server/helper.c
index bb2eb9b..477acef 100644
--- a/src/server/helper.c
+++ b/src/server/helper.c
@@ -1,13 +1,9 @@
 #include "helper.h"
 #include <arpa/inet.h>
-#include <string.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <sys/prctl.h> // For thread names
 #include <signal.h>
 
-#include "../config.h"
-
 /**
  * Parse IPv4 or IPv6 address in string representation to a suitable format usable by the BSD socket library
  * !! Contents of 'string' might be modified by this function !!
diff --git a/src/server/helper.h b/src/server/helper.h
index fd63f7a..2173046 100644
--- a/src/server/helper.h
+++ b/src/server/helper.h
@@ -3,11 +3,11 @@
 
 #include "server.h"
 #include "../shared/log.h"
+#include "../types.h"
 #include <netinet/in.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include "../types.h"
 
 #define ERROR_GOTO(jumplabel, ...) do { logadd(LOG_ERROR, __VA_ARGS__); goto jumplabel; } while (0);
 
diff --git a/src/server/image.h b/src/server/image.h
index 859507d..718e741 100644
--- a/src/server/image.h
+++ b/src/server/image.h
@@ -1,10 +1,9 @@
 #ifndef _IMAGE_H_
 #define _IMAGE_H_
 
-#include <jansson.h>
-
-#include "../config.h"
 #include "globals.h"
+#include "../config.h"
+#include <jansson.h>
 
 extern dnbd3_image_t *_images[SERVER_MAX_IMAGES];
 extern int _num_images;
diff --git a/src/server/ini.c b/src/server/ini.c
index fc4414c..216543b 100644
--- a/src/server/ini.c
+++ b/src/server/ini.c
@@ -7,12 +7,11 @@
 
  */
 
-#include <stdio.h>
+#include "ini.h"
+
 #include <ctype.h>
 #include <string.h>
 
-#include "ini.h"
-
 #if !INI_USE_STACK
 #include <stdlib.h>
 #endif
diff --git a/src/server/integrity.c b/src/server/integrity.c
index d673a9d..1c3026c 100644
--- a/src/server/integrity.c
+++ b/src/server/integrity.c
@@ -1,19 +1,11 @@
 #include "integrity.h"
 
+#include "helper.h"
 #include "locks.h"
 #include "image.h"
-#include "globals.h"
-#include "../shared/log.h"
-#include "helper.h"
 
-#include <pthread.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include <string.h>
 #include <assert.h>
+#include <sys/syscall.h>
 #include <sys/resource.h>
 
 #define CHECK_QUEUE_SIZE 100
diff --git a/src/server/locks.c b/src/server/locks.c
index 4dedb94..6996c22 100644
--- a/src/server/locks.c
+++ b/src/server/locks.c
@@ -6,19 +6,9 @@
  */
 
 #include "locks.h"
-
-#ifdef _DEBUG
-
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "globals.h"
-#include "../shared/log.h"
 #include "helper.h"
-#include "../shared/fdsignal.h"
 
+#ifdef _DEBUG
 #define MAXLOCKS 2000
 #define MAXTHREADS 500
 #define LOCKLEN 60
diff --git a/src/server/locks.h b/src/server/locks.h
index 27af006..16b59a7 100644
--- a/src/server/locks.h
+++ b/src/server/locks.h
@@ -2,13 +2,12 @@
 #define _LOCKS_H_
 
 #include <pthread.h>
-
-#ifdef _DEBUG
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef _DEBUG
+
 #define spin_init( lock, type ) debug_spin_init( #lock, __FILE__, __LINE__, lock, type)
 #define spin_lock( lock ) debug_spin_lock( #lock, __FILE__, __LINE__, lock)
 #define spin_trylock( lock ) debug_spin_trylock( #lock, __FILE__, __LINE__, lock)
diff --git a/src/server/net.c b/src/server/net.c
index 93145a5..d840718 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -18,32 +18,18 @@
  *
  */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/sendfile.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <signal.h>
-
-#include "../shared/sockhelper.h"
 #include "helper.h"
-#include "server.h"
 #include "image.h"
 #include "uplink.h"
-#include "altservers.h"
-#include "../shared/log.h"
-#include "helper.h"
-#include "../serialize.h"
-#include "../config.h"
-#include "../types.h"
 #include "locks.h"
 #include "rpc.h"
+#include "altservers.h"
+
+#include "../shared/sockhelper.h"
+#include "../serialize.h"
+
+#include <sys/sendfile.h>
+#include <assert.h>
 
 static char nullbytes[500];
 
diff --git a/src/server/rpc.c b/src/server/rpc.c
index 4cd1f6e..0bef7ca 100644
--- a/src/server/rpc.c
+++ b/src/server/rpc.c
@@ -1,17 +1,10 @@
 #include "rpc.h"
-#include "server.h"
+#include "helper.h"
 #include "net.h"
 #include "uplink.h"
-#include "../shared/log.h"
 #include "locks.h"
-#include "../shared/sockhelper.h"
-#include "helper.h"
 #include "image.h"
-
-#include <unistd.h>
-#include <string.h>
-#include <jansson.h>
-#include <inttypes.h>
+#include "../shared/sockhelper.h"
 
 static void clientsToJson(json_t *jsonClients);
 
diff --git a/src/server/server.c b/src/server/server.c
index 30b8594..d62f6c2 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -18,33 +18,25 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <getopt.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <assert.h>
-#include "../types.h"
-#include "../version.h"
+#include "server.h"
+#include "helper.h"
 
 #include "locks.h"
-#include "../shared/sockhelper.h"
-#include "server.h"
 #include "image.h"
 #include "uplink.h"
 #include "net.h"
 #include "altservers.h"
-#include "../shared/log.h"
-#include "globals.h"
 #include "integrity.h"
-#include "helper.h"
 #include "threadpool.h"
 
+#include "../version.h"
+#include "../shared/sockhelper.h"
+
+#include <signal.h>
+#include <getopt.h>
+#include <assert.h>
+
+
 poll_list_t *listeners = NULL;
 
 dnbd3_client_t *_clients[SERVER_MAX_CLIENTS];
diff --git a/src/server/server.h b/src/server/server.h
index 8769540..8e88fe8 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -21,12 +21,12 @@
 #ifndef SERVER_H_
 #define SERVER_H_
 
-#include <stdint.h>
-#include <stdio.h>
-
+#include "globals.h"
 #include "../config.h"
 #include "../types.h"
-#include "globals.h"
+
+#include <stdint.h>
+#include <stdio.h>
 
 struct sockaddr_storage;
 
diff --git a/src/server/threadpool.c b/src/server/threadpool.c
index dbc23d7..b55fe19 100644
--- a/src/server/threadpool.c
+++ b/src/server/threadpool.c
@@ -1,11 +1,7 @@
+#include "threadpool.h"
 #include "globals.h"
 #include "helper.h"
-#include "threadpool.h"
-#include "../shared/fdsignal.h"
 #include "locks.h"
-#include <pthread.h>
-#include <stdlib.h>
-
 
 typedef struct _entry_t {
 	struct _entry_t *next;
diff --git a/src/server/uplink.c b/src/server/uplink.c
index 05405b0..3a761ac 100644
--- a/src/server/uplink.c
+++ b/src/server/uplink.c
@@ -1,22 +1,12 @@
 #include "uplink.h"
+#include "helper.h"
 #include "locks.h"
-#include "../shared/log.h"
-#include "../shared/sockhelper.h"
 #include "image.h"
-#include "helper.h"
 #include "altservers.h"
-#include "helper.h"
+#include "../shared/sockhelper.h"
 #include "../shared/protocol.h"
-#include "../shared/fdsignal.h"
 
-#include <pthread.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <sys/errno.h>
 #include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <inttypes.h>
 #include <zlib.h>
 #include <fcntl.h>
diff --git a/src/server/uplink.h b/src/server/uplink.h
index 43c068f..c8cf4eb 100644
--- a/src/server/uplink.h
+++ b/src/server/uplink.h
@@ -1,8 +1,8 @@
 #ifndef _UPLINK_H_
 #define _UPLINK_H_
 
-#include "../types.h"
 #include "globals.h"
+#include "../types.h"
 
 void uplink_globalsInit();
 
diff --git a/src/shared/log.c b/src/shared/log.c
index da27392..afafc6f 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -21,13 +21,9 @@
 #include "log.h"
 #include <stdarg.h>
 #include <pthread.h>
-#include <time.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/shared/sockhelper.c b/src/shared/sockhelper.c
index d1dbd8c..4a4563e 100644
--- a/src/shared/sockhelper.c
+++ b/src/shared/sockhelper.c
@@ -1,10 +1,7 @@
 #include "sockhelper.h"
 #include "log.h"
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <arpa/inet.h> // inet_ntop
 #include <netdb.h>
-#include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/shared/sockhelper.h b/src/shared/sockhelper.h
index ad3ee65..86c3b3e 100644
--- a/src/shared/sockhelper.h
+++ b/src/shared/sockhelper.h
@@ -6,8 +6,8 @@
  * abstract from the IP version by using getaddrinfo() and thelike.
  */
 
-#include <stdint.h>
 #include "../types.h"
+#include <stdint.h>
 #include <sys/socket.h>
 #include <string.h>
 
-- 
cgit v1.2.3-55-g7522