X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=c3f86410d4fe392a2ced76b09e6af8ba8af534d5;hb=631ba3090714a9786457dd39da8ed50925715432;hp=2b56d7d225a703b6a206ad949a87765dff147760;hpb=54e31a205c63d8bc8cd3dcf6956f81d3b968ea48;p=git.git

diff --git a/daemon.c b/daemon.c
index 2b56d7d2..c3f86410 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,3 @@
-#include "cache.h"
-#include "pkt-line.h"
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -9,6 +7,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
+#include "pkt-line.h"
+#include "cache.h"
 
 static int log_syslog;
 static int verbose;
@@ -145,11 +145,11 @@ static int set_dir(const char *dir)
 
 	if ( chdir(dir) )
 		return -1;
-	
+
 	/*
 	 * Security on the cheap.
 	 *
-	 * We want a readable HEAD, usable "objects" directory, and 
+	 * We want a readable HEAD, usable "objects" directory, and
 	 * a "git-daemon-export-ok" flag that says that the other side
 	 * is ok with us doing this.
 	 */
@@ -529,7 +529,7 @@ static int service_loop(int socknum, int *socklist)
 	}
 
 	signal(SIGCHLD, child_handler);
-	
+
 	for (;;) {
 		int i;
 
@@ -566,13 +566,13 @@ static int service_loop(int socknum, int *socklist)
 static int serve(int port)
 {
 	int socknum, *socklist;
-	
+
 	socknum = socksetup(port, &socklist);
 	if (socknum == 0)
 		die("unable to allocate any listen sockets on port %u", port);
-	
+
 	return service_loop(socknum, socklist);
-}	
+}
 
 int main(int argc, char **argv)
 {