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.

diff --git a/afh.c b/afh.c
index c5d7aec296a7a44b2fedfd2532ad838f89654e6c..53c721161378193c385f7706bca47dc8ad97d2f9 100644 (file)
--- a/afh.c
+++ b/afh.c
@@ -7,7 +7,6 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>

-#include <dirent.h>

 #include <sys/time.h>
 
 #include "para.h"
 #include <sys/time.h>
 
 #include "para.h"

diff --git a/afh_common.c b/afh_common.c
index 7ecab4e47a9bd7e47bcc7e378043d62d663cf343..769674134b0f16d88bbe856d2daf972e54ed4c1b 100644 (file)
--- 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 <sys/mman.h> /* mmap */
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>

-#include <dirent.h>

 #include <regex.h>
 
 #include "para.h"
 #include <regex.h>
 
 #include "para.h"

diff --git a/afs.c b/afs.c
index 337045c9a6fd65ac05e412d5eb453401bbaa9436..ac75164c0291f955c80857876fa8af48607e2814 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -19,9 +19,6 @@
 #include "afh.h"
 #include "afs.h"
 #include "server.h"
 #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"
 #include "net.h"
 #include "ipc.h"
 #include "list.h"

diff --git a/aft.c b/aft.c
index bcfe7e7d070198784875824c1902520c73028cc5..157b5a626b58306647fd3a09502efe992ed44bdc 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -7,7 +7,6 @@
 /** \file aft.c Audio file table functions. */
 
 #include <regex.h>
 /** \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>
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>

diff --git a/alsa_write.c b/alsa_write.c
index 8cf5cfd25bf3909e0f4d338d2397ca0e017c29ab..c2a4cc1e94f47d9cf9717334059e6cf57df4970a 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -14,7 +14,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <stdbool.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <stdbool.h>

diff --git a/audioc.c b/audioc.c
index 74fb824cfff9d7193ebe42af9bfdc97ed5863fe0..c05bd14e105da209a88ae60ab1a7b9e208df8aa8 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "audioc.cmdline.h"
 #include "para.h"
 
 #include "audioc.cmdline.h"
 #include "para.h"

diff --git a/audiod.c b/audiod.c
index 40a35c6a601cf5839b044e44be35992b6e8036d3..34a41620120dfb48887c0623a550799850b28019 100644 (file)
--- 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>
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <signal.h>
 #include <stdbool.h>
 
 #include <signal.h>
 #include <stdbool.h>
 

diff --git a/audiod_command.c b/audiod_command.c
index bfd7c4aa5df170235f24961813bc4cc2e69790fa..05059ac06d2ff7f23a9648e14e54c71c904bfa9d 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"

diff --git a/client_common.c b/client_common.c
index c7ea3b4cb0dde32a36c1a50ebdb72658b9ec47e2..33ad19546d2a6e8f5d072152f75e11fefbd6fb18 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/command.c b/command.c
index 22a71444bf2c694bb76edc26705521d6930e19f0..1a090e49d71bb3d1ff3545236265f4c052bf83fe 100644 (file)
--- a/command.c
+++ b/command.c
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <osl.h>
 #include <stdbool.h>
 
 #include <osl.h>
 #include <stdbool.h>
 

diff --git a/crypt.c b/crypt.c
index f3bfed3be755ccce6ba9ec1d89c40934babedc35..9085f66b1ad88b316801739fef480c84ab3fb2c4 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -7,7 +7,6 @@
 /** \file crypt.c Openssl-based encryption/decryption routines. */
 
 #include <regex.h>
 /** \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>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <openssl/rand.h>

diff --git a/dccp_recv.c b/dccp_recv.c
index 41c2ee1a690a82ebee2623c3f79efe21b8e364e2..af8e6b1657e86777af5f6360c573c60bcc46e93c 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"


@@ -39,7 +38,6 @@ struct private_dccp_recv_data {
        struct btr_pool *btrp;
 };
 
        struct btr_pool *btrp;
 };
 

-

 static void dccp_recv_close(struct receiver_node *rn)
 {
 
 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;
 }
 
        rn->private_data = NULL;
 }
 

-

 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
 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 304a42e749a647d5d6a568ae0e9850d183907979..0484778eb593d342eaa0fd961a521e587a5ef468 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <osl.h>
 
 #include "para.h"
 #include <osl.h>
 
 #include "para.h"

diff --git a/exec.c b/exec.c
index b11b217b963fd2359622d5f56688c7f51e80b766..e765dc4d8f0473290b309efd45e04318b21b6792 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -7,7 +7,6 @@
 /** \file exec.c Helper functions for spawning new processes. */
 
 #include <regex.h>
 /** \file exec.c Helper functions for spawning new processes. */
 
 #include <regex.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "close_on_fork.h"
 
 #include "para.h"
 #include "close_on_fork.h"

diff --git a/fade.c b/fade.c
index 5fbd0dd48027ad990345aa5d8f86fa0d952e6188..e0ab967c68e012a5e788390e52e6aa4015077e2b 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <stdlib.h> /* EXIT_SUCCESS */
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <stdlib.h> /* EXIT_SUCCESS */

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 4f3ba950d985b3548dfc926402bbaae5e1ad2434..fb2dba025d37806b2b70bd8f8002cae09e3e4db8 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <stdbool.h>
 
 #include <regex.h>
 #include <stdbool.h>
 

-#include <dirent.h>

 #include "para.h"
 #include "error.h"
 #include "list.h"
 #include "para.h"
 #include "error.h"
 #include "list.h"

diff --git a/file_write.c b/file_write.c
index 8cafbb687b8498ff6b9db43a1129676363b3db20..bfade187a8b215ff74fb5baecee845149f360528 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <sys/time.h>
 #include <stdbool.h>
 
 #include <sys/time.h>
 #include <stdbool.h>
 

diff --git a/filter_common.c b/filter_common.c
index 269c4d6d5fb516402d756906bdb57fc5c2be2275..566d97edc9ee7eca82525f7854c4b81aed93c04d 100644 (file)
--- a/filter_common.c
+++ b/filter_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"

diff --git a/grab_client.c b/grab_client.c
index c410b3b934f398a6eb6bbd480f5d7e8f31535d62..0d3b6036a924674866dbead443a2daaf273751b9 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"

diff --git a/gui.c b/gui.c
index 38addd9815cc5bf2775c80278679a1e9c64e872e..29089244c0439cfab0f779b217f672a3e24353c9 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <curses.h>
 
 #include "gui.cmdline.h"
 #include <curses.h>
 
 #include "gui.cmdline.h"

diff --git a/http_recv.c b/http_recv.c
index 53ef8e60d03f6d7afc4d5b9d7e3b7a2e71c97deb..5717692ce2133e548fee68552787cd89c9c69fc0 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/http_send.c b/http_send.c
index 086b600f0d043f928e6c2c0f71afa65104045f00..8ae2341a0351d9edc447f544c33fd66e0fb6c74a 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <osl.h>
 #include <stdbool.h>
 
 #include <osl.h>
 #include <stdbool.h>
 

diff --git a/net.c b/net.c
index bd1bcc648cad5148ac4cad581bcf4d2566a63078..ffd4350b4b14bc32d8e270db2734cc97fee400df 100644 (file)
--- a/net.c
+++ b/net.c
@@ -25,7 +25,6 @@
 #define AI_ADDRCONFIG 0
 #endif
 
 #define AI_ADDRCONFIG 0
 #endif
 

-#include <dirent.h>

 #include <regex.h>
 
 #include "para.h"
 #include <regex.h>
 
 #include "para.h"

diff --git a/oss_write.c b/oss_write.c
index e79ea6ced6c62f3fdfe1b6ce59cf7f7784cb9614..d583c2338bb1dc0dc96d274d49824d45a3b75c6e 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>

-#include <dirent.h>

 #include <sys/soundcard.h>
 #include <stdbool.h>
 
 #include <sys/soundcard.h>
 #include <stdbool.h>
 

diff --git a/osx_write.c b/osx_write.c
index f27a49b0f1183947763c6bae1ac31b2af1b92e3a..50f22be9a4939121f1573462ffdfd31037257aa0 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"

diff --git a/recv.c b/recv.c
index a737e4cbde81760cc2bf2014bd72b56b07210a60..8e6d75b1c8b6fe3a1fa9d6865e9d3c71eb0e5843 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"

diff --git a/sched.c b/sched.c
index 9be3a2e83109f0db884c5fdebf3e7e62f4f9b3c5..8baed4962d9e5dfbf2cad170b1c38d2d42b123b3 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -7,7 +7,6 @@
 /** \file sched.c Paraslash's scheduling functions. */
 
 #include <regex.h>
 /** \file sched.c Paraslash's scheduling functions. */
 
 #include <regex.h>

-#include <dirent.h> /* readdir() */

 #include <assert.h>
 #include <sys/time.h>
 
 #include <assert.h>
 #include <sys/time.h>
 

diff --git a/send_common.c b/send_common.c
index 6a85644d734d6c2f7fd748edf688c6cc21b18651..e786f996ad3b85218d9953a01fee6a86f34b6de4 100644 (file)
--- 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>
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
 #include <regex.h>

-#include <dirent.h>

 #include <osl.h>
 
 #include "para.h"
 #include <osl.h>
 
 #include "para.h"

diff --git a/server.c b/server.c
index 9f237ad7f3d7e10dee527dce33f4b1ac0da30410..0ae888fa8557357838df38b0be1c9c8ae40cfaad 100644 (file)
--- a/server.c
+++ b/server.c
@@ -62,7 +62,6 @@
  */
 
 #include <signal.h>
  */
 
 #include <signal.h>

-#include <dirent.h>

 #include <sys/time.h>
 #include <regex.h>
 #include <osl.h>
 #include <sys/time.h>
 #include <regex.h>
 #include <osl.h>

diff --git a/signal.c b/signal.c
index 4726571c40da9a166fcef51655b2d20d87fd59b0..f02c453a04a02e5d3e1c8a9c791aba8275a60671 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -7,7 +7,6 @@
 
 #include <signal.h>
 #include <sys/types.h>
 
 #include <signal.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/stdin.c b/stdin.c
index e625f3726789972386de10c8af86d68b206e82c4..14dd9d40f4d56e2cb5845fa95546db7a7baa8581 100644 (file)
--- a/stdin.c
+++ b/stdin.c
@@ -6,7 +6,6 @@
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 

-#include <dirent.h> /* readdir() */

 #include <assert.h>
 #include <stdbool.h>
 #include <regex.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <regex.h>

diff --git a/stdout.c b/stdout.c
index 5604fced075f5c2b24b8df622c6e0ad5c3a320dc..a2ee2aca6af8114eadf92539092bcca9bb7d0e09 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -6,7 +6,6 @@
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 

-#include <dirent.h> /* readdir() */

 #include <assert.h>
 #include <stdbool.h>
 
 #include <assert.h>
 #include <stdbool.h>
 

diff --git a/udp_recv.c b/udp_recv.c
index e276343ea1aae1b2a750389c4c691170b9c3aa6e..45d24eae2cd40e9ee4b53106b92ccb85c779dc85 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -6,7 +6,6 @@
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <regex.h>
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <regex.h>

-#include <dirent.h>

 #include <sys/socket.h>
 #include <net/if.h>
 
 #include <sys/socket.h>
 #include <net/if.h>
 

diff --git a/udp_send.c b/udp_send.c
index b4494eb7edb9e9fd26c1f4d20e9b81b06472c625..7a1a89f73e1ab79d91fa2e0978072eaf9e10fc46 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -9,7 +9,6 @@
 
 #include <regex.h>
 #include <sys/time.h>
 
 #include <regex.h>
 #include <sys/time.h>

-#include <dirent.h>

 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>

diff --git a/user_list.c b/user_list.c
index 0f56b651680e1b5f4c275432e7f209714222045e..9de54f43b415e53600da0caef967dcf92164c8f1 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/vss.c b/vss.c
index ba6f7c4c655134d11d79e6411ab92d63b4efd160..dfd80ebcb817526c6e0c5c4f62eeb07ae6fc9375 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -12,7 +12,6 @@
  */
 
 #include <regex.h>
  */
 
 #include <regex.h>

-#include <dirent.h>

 #include <osl.h>
 
 #include "para.h"
 #include <osl.h>
 
 #include "para.h"

diff --git a/write.c b/write.c
index b3824a081f594dee23617502caf65261717d77b9..8ddd51a9d4d8ef5b061159102f0b99390cc283d5 100644 (file)
--- a/write.c
+++ b/write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"