From 0fb5ced9ef7858c288cfd9b2965edae907a7b11f Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 12 May 2015 00:50:19 +0100
Subject: [PATCH] Removed pthreads dependency, tidied server code

---
 configure.ac        |  3 ---
 src/server/server.c | 10 ++++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index b3794a8..1533ea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,9 +14,6 @@ AC_PROG_CC
 PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
     [AC_MSG_ERROR([glib 2.26 or higher is required])])
 
-AC_CHECK_LIB([pthread], [main], [],
-    [AC_MSG_ERROR([pthread is required])])
-
 AM_CFLAGS="-Wall -Wno-deprecated-declarations"
 AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"
 AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS"
diff --git a/src/server/server.c b/src/server/server.c
index 065ec61..ed3b8bb 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -163,8 +163,6 @@ int main(int argc , char *argv[])
         port = 5222;
     }
 
-    int listen_socket, client_socket;
-    int c, ret;
     struct sockaddr_in server_addr, client_addr;
 
     if (argc == 2) {
@@ -175,7 +173,7 @@ int main(int argc , char *argv[])
 
     // create socket
     errno = 0;
-    listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); // ipv4, tcp, ip
+    int listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); // ipv4, tcp, ip
     if (listen_socket == -1) {
         perror("Could not create socket");
         return 0;
@@ -187,7 +185,7 @@ int main(int argc , char *argv[])
 
     // bind socket to port
     errno = 0;
-    ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr));
+    int ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr));
     if (ret == -1) {
         perror("Bind failed");
         return 0;
@@ -203,9 +201,9 @@ int main(int argc , char *argv[])
     puts("Waiting for incoming connections...");
 
     // connection accept
-    c = sizeof(struct sockaddr_in);
+    int c = sizeof(struct sockaddr_in);
     errno = 0;
-    client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c);
+    int client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c);
     if (client_socket == -1) {
         perror("Accept failed");
         return 0;