format.sh reformat using clang-format 3.8

src/log.c

@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "log.h"
 #include "util.h"

src/main.c

@@ -1,8 +1,8 @@
+#include <ctype.h>
 #include <pcre.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifdef _WIN32

src/options.c

@@ -10,11 +10,11 @@
 
 #include "config.h"
 #include "ignore.h"
-#include "options.h"
 #include "lang.h"
 #include "log.h"
-#include "util.h"
+#include "options.h"
 #include "print.h"
+#include "util.h"
 
 const char *color_line_number = "\033[1;33m"; /* bold yellow */
 const char *color_match = "\033[30;43m";      /* black with yellow background */

src/print.c

@@ -1,8 +1,8 @@
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #include "ignore.h"
 #include "log.h"

src/print_w32.c

@@ -1,10 +1,10 @@
 #ifdef _WIN32
 
-#include <windows.h>
-#include <stdio.h>
+#include "print.h"
 #include <io.h>
 #include <stdarg.h>
-#include "print.h"
+#include <stdio.h>
+#include <windows.h>
 
 #ifndef FOREGROUND_MASK
 #define FOREGROUND_MASK (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY)

src/search.h

@@ -23,13 +23,13 @@
 #include <pthread.h>
 #endif
 
+#include "decompress.h"
 #include "ignore.h"
 #include "log.h"
 #include "options.h"
 #include "print.h"
-#include "util.h"
-#include "decompress.h"
 #include "uthash.h"
+#include "util.h"
 
 size_t alpha_skip_lookup[256];
 size_t *find_skip_lookup;

src/uthash.h

@@ -24,9 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef UTHASH_H
 #define UTHASH_H
 
-#include <string.h> /* memcmp,strlen */
 #include <stddef.h> /* ptrdiff_t */
 #include <stdlib.h> /* exit() */
+#include <string.h> /* memcmp,strlen */
 
 /* These macros use decltype or the earlier __typeof GNU extension.
    As decltype is only available in newer compilers (VS2010 or gcc 4.3+

src/util.c

@@ -1,12 +1,12 @@
 #include <ctype.h>
-#include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 
-#include "util.h"
 #include "config.h"
+#include "util.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/util.h

@@ -4,8 +4,8 @@
 #include <dirent.h>
 #include <pcre.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/time.h>
 
 #include "config.h"