From d7b4aa3835197ee906f13f515040e1cda6385544 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Tue, 1 Mar 2011 00:40:37 +0100
Subject: [PATCH] Remove some unnecessary includes.

This gets rid of quite some inclusions of <dirent.h> which are not needed
as most .c files do not deal with directories at all.

afs.c doe not mmap anything and needs nothing from sys/time.h so remove
these includes as well.
---
 afh.c            | 1 -
 afh_common.c     | 1 -
 afs.c            | 3 ---
 aft.c            | 1 -
 alsa_write.c     | 1 -
 audioc.c         | 1 -
 audiod.c         | 1 -
 audiod_command.c | 1 -
 client_common.c  | 1 -
 command.c        | 1 -
 crypt.c          | 1 -
 dccp_recv.c      | 3 ---
 dccp_send.c      | 1 -
 exec.c           | 1 -
 fade.c           | 1 -
 fecdec_filter.c  | 1 -
 file_write.c     | 1 -
 filter_common.c  | 1 -
 grab_client.c    | 1 -
 gui.c            | 1 -
 http_recv.c      | 1 -
 http_send.c      | 1 -
 net.c            | 1 -
 oss_write.c      | 1 -
 osx_write.c      | 1 -
 recv.c           | 1 -
 sched.c          | 1 -
 send_common.c    | 1 -
 server.c         | 1 -
 signal.c         | 1 -
 stdin.c          | 1 -
 stdout.c         | 1 -
 udp_recv.c       | 1 -
 udp_send.c       | 1 -
 user_list.c      | 1 -
 vss.c            | 1 -
 write.c          | 1 -
 37 files changed, 41 deletions(-)

diff --git a/afh.c b/afh.c
index c5d7aec2..53c72116 100644
--- a/afh.c
+++ b/afh.c
@@ -7,7 +7,6 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/time.h>
 
 #include "para.h"
diff --git a/afh_common.c b/afh_common.c
index 7ecab4e4..76967413 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -9,7 +9,6 @@
 #include <sys/mman.h> /* mmap */
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
-#include <dirent.h>
 #include <regex.h>
 
 #include "para.h"
diff --git a/afs.c b/afs.c
index 337045c9..ac75164c 100644
--- a/afs.c
+++ b/afs.c
@@ -19,9 +19,6 @@
 #include "afh.h"
 #include "afs.h"
 #include "server.h"
-#include <dirent.h> /* readdir() */
-#include <sys/mman.h>
-#include <sys/time.h>
 #include "net.h"
 #include "ipc.h"
 #include "list.h"
diff --git a/aft.c b/aft.c
index bcfe7e7d..157b5a62 100644
--- a/aft.c
+++ b/aft.c
@@ -7,7 +7,6 @@
 /** \file aft.c Audio file table functions. */
 
 #include <regex.h>
-#include <dirent.h> /* readdir() */
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>
diff --git a/alsa_write.c b/alsa_write.c
index 8cf5cfd2..c2a4cc1e 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -14,7 +14,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <stdbool.h>
diff --git a/audioc.c b/audioc.c
index 74fb824c..c05bd14e 100644
--- a/audioc.c
+++ b/audioc.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "audioc.cmdline.h"
 #include "para.h"
diff --git a/audiod.c b/audiod.c
index 40a35c6a..34a41620 100644
--- a/audiod.c
+++ b/audiod.c
@@ -7,7 +7,6 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <signal.h>
 #include <stdbool.h>
 
diff --git a/audiod_command.c b/audiod_command.c
index bfd7c4aa..05059ac0 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
diff --git a/client_common.c b/client_common.c
index c7ea3b4c..33ad1954 100644
--- a/client_common.c
+++ b/client_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/command.c b/command.c
index 22a71444..1a090e49 100644
--- a/command.c
+++ b/command.c
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
 #include <stdbool.h>
 
diff --git a/crypt.c b/crypt.c
index f3bfed3b..9085f66b 100644
--- a/crypt.c
+++ b/crypt.c
@@ -7,7 +7,6 @@
 /** \file crypt.c Openssl-based encryption/decryption routines. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <openssl/rand.h>
diff --git a/dccp_recv.c b/dccp_recv.c
index 41c2ee1a..af8e6b16 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -39,7 +38,6 @@ struct private_dccp_recv_data {
 	struct btr_pool *btrp;
 };
 
-
 static void dccp_recv_close(struct receiver_node *rn)
 {
 
@@ -52,7 +50,6 @@ static void dccp_recv_close(struct receiver_node *rn)
 	rn->private_data = NULL;
 }
 
-
 static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
diff --git a/dccp_send.c b/dccp_send.c
index 304a42e7..0484778e 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
 
 #include "para.h"
diff --git a/exec.c b/exec.c
index b11b217b..e765dc4d 100644
--- a/exec.c
+++ b/exec.c
@@ -7,7 +7,6 @@
 /** \file exec.c Helper functions for spawning new processes. */
 
 #include <regex.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "close_on_fork.h"
diff --git a/fade.c b/fade.c
index 5fbd0dd4..e0ab967c 100644
--- a/fade.c
+++ b/fade.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <stdlib.h> /* EXIT_SUCCESS */
diff --git a/fecdec_filter.c b/fecdec_filter.c
index 4f3ba950..fb2dba02 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <stdbool.h>
 
-#include <dirent.h>
 #include "para.h"
 #include "error.h"
 #include "list.h"
diff --git a/file_write.c b/file_write.c
index 8cafbb68..bfade187 100644
--- a/file_write.c
+++ b/file_write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <sys/time.h>
 #include <stdbool.h>
 
diff --git a/filter_common.c b/filter_common.c
index 269c4d6d..566d97ed 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
diff --git a/grab_client.c b/grab_client.c
index c410b3b9..0d3b6036 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
diff --git a/gui.c b/gui.c
index 38addd98..29089244 100644
--- a/gui.c
+++ b/gui.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <curses.h>
 
 #include "gui.cmdline.h"
diff --git a/http_recv.c b/http_recv.c
index 53ef8e60..5717692c 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/http_send.c b/http_send.c
index 086b600f..8ae2341a 100644
--- a/http_send.c
+++ b/http_send.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
 #include <stdbool.h>
 
diff --git a/net.c b/net.c
index bd1bcc64..ffd4350b 100644
--- a/net.c
+++ b/net.c
@@ -25,7 +25,6 @@
 #define AI_ADDRCONFIG 0
 #endif
 
-#include <dirent.h>
 #include <regex.h>
 
 #include "para.h"
diff --git a/oss_write.c b/oss_write.c
index e79ea6ce..d583c233 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <sys/soundcard.h>
 #include <stdbool.h>
 
diff --git a/osx_write.c b/osx_write.c
index f27a49b0..50f22be9 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
diff --git a/recv.c b/recv.c
index a737e4cb..8e6d75b1 100644
--- a/recv.c
+++ b/recv.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
diff --git a/sched.c b/sched.c
index 9be3a2e8..8baed496 100644
--- a/sched.c
+++ b/sched.c
@@ -7,7 +7,6 @@
 /** \file sched.c Paraslash's scheduling functions. */
 
 #include <regex.h>
-#include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <sys/time.h>
 
diff --git a/send_common.c b/send_common.c
index 6a85644d..e786f996 100644
--- a/send_common.c
+++ b/send_common.c
@@ -7,7 +7,6 @@
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <osl.h>
 
 #include "para.h"
diff --git a/server.c b/server.c
index 9f237ad7..0ae888fa 100644
--- a/server.c
+++ b/server.c
@@ -62,7 +62,6 @@
  */
 
 #include <signal.h>
-#include <dirent.h>
 #include <sys/time.h>
 #include <regex.h>
 #include <osl.h>
diff --git a/signal.c b/signal.c
index 4726571c..f02c453a 100644
--- a/signal.c
+++ b/signal.c
@@ -7,7 +7,6 @@
 
 #include <signal.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/stdin.c b/stdin.c
index e625f372..14dd9d40 100644
--- a/stdin.c
+++ b/stdin.c
@@ -6,7 +6,6 @@
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 
-#include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <stdbool.h>
 #include <regex.h>
diff --git a/stdout.c b/stdout.c
index 5604fced..a2ee2aca 100644
--- a/stdout.c
+++ b/stdout.c
@@ -6,7 +6,6 @@
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 
-#include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <stdbool.h>
 
diff --git a/udp_recv.c b/udp_recv.c
index e276343e..45d24eae 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -6,7 +6,6 @@
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
diff --git a/udp_send.c b/udp_send.c
index b4494eb7..7a1a89f7 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -9,7 +9,6 @@
 
 #include <regex.h>
 #include <sys/time.h>
-#include <dirent.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
diff --git a/user_list.c b/user_list.c
index 0f56b651..9de54f43 100644
--- a/user_list.c
+++ b/user_list.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/vss.c b/vss.c
index ba6f7c4c..dfd80ebc 100644
--- a/vss.c
+++ b/vss.c
@@ -12,7 +12,6 @@
  */
 
 #include <regex.h>
-#include <dirent.h>
 #include <osl.h>
 
 #include "para.h"
diff --git a/write.c b/write.c
index b3824a08..8ddd51a9 100644
--- a/write.c
+++ b/write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
-- 
2.39.5