From b79beeff66eae74ab83cd7cd4e2197a1dded310a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Jul 2007 20:10:42 +0000 Subject: [PATCH] clean up #includes a bit. --- libtransmission/bencode.c | 1 + libtransmission/choking.c | 1 + libtransmission/choking.h | 5 +++++ libtransmission/http.c | 2 ++ libtransmission/inout.c | 4 ++-- libtransmission/internal.h | 13 ------------- libtransmission/makemeta.c | 1 + libtransmission/metainfo.c | 3 +++ libtransmission/natpmp.c | 2 ++ libtransmission/net.c | 3 +++ libtransmission/peer.c | 3 +++ libtransmission/shared.c | 7 ++++++- libtransmission/torrent.c | 3 +++ libtransmission/tracker.c | 4 ++++ libtransmission/transmission.c | 2 ++ libtransmission/trcompat.h | 2 ++ libtransmission/upnp.c | 4 ++++ libtransmission/xml.c | 1 + 18 files changed, 45 insertions(+), 16 deletions(-) diff --git a/libtransmission/bencode.c b/libtransmission/bencode.c index 1132fcf79..5075c0799 100644 --- a/libtransmission/bencode.c +++ b/libtransmission/bencode.c @@ -24,6 +24,7 @@ #include /* for isdigit */ #include "transmission.h" +#include "bencode.h" /* setting to 1 to help expose bugs with tr_bencListAdd and tr_bencDictAdd */ #define LIST_SIZE 20 /* number of items to increment list/dict buffer by */ diff --git a/libtransmission/choking.c b/libtransmission/choking.c index 4006e2b20..71238a559 100644 --- a/libtransmission/choking.c +++ b/libtransmission/choking.c @@ -24,6 +24,7 @@ #include #include "transmission.h" +#include "choking.h" #ifndef HAVE_LRINTF # define lrintf(a) ((int)(0.5+(a))) diff --git a/libtransmission/choking.h b/libtransmission/choking.h index 61a195567..e4f8b9885 100644 --- a/libtransmission/choking.h +++ b/libtransmission/choking.h @@ -22,9 +22,14 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#ifndef TR_CHOKING_H +#define TR_CHOKING_H + typedef struct tr_choking_s tr_choking_t; tr_choking_t * tr_chokingInit( tr_handle_t * ); void tr_chokingSetLimit( tr_choking_t *, int ); void tr_chokingPulse( tr_choking_t * ); void tr_chokingClose( tr_choking_t * ); + +#endif /* TR_CHOKING_H */ diff --git a/libtransmission/http.c b/libtransmission/http.c index 1435ef181..d909cc471 100644 --- a/libtransmission/http.c +++ b/libtransmission/http.c @@ -23,6 +23,8 @@ *****************************************************************************/ #include "transmission.h" +#include "http.h" +#include "net.h" #define HTTP_PORT 80 /* default http port 80 */ #define HTTP_TIMEOUT 60000 /* one minute http timeout */ diff --git a/libtransmission/inout.c b/libtransmission/inout.c index 78e1a8d5e..87281d3ec 100644 --- a/libtransmission/inout.c +++ b/libtransmission/inout.c @@ -9,14 +9,14 @@ */ #include "transmission.h" +#include "fastresume.h" +#include "fdlimit.h" struct tr_io_s { tr_torrent_t * tor; }; -#include "fastresume.h" - /**** ***** Low-level IO functions ****/ diff --git a/libtransmission/internal.h b/libtransmission/internal.h index fc31386ac..46bd31144 100644 --- a/libtransmission/internal.h +++ b/libtransmission/internal.h @@ -131,24 +131,11 @@ typedef struct tr_bitfield_s tr_bitfield_t; typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t; -#include "trcompat.h" -#include "bsdqueue.h" -#include "bsdtree.h" #include "platform.h" -#include "bencode.h" -#include "metainfo.h" #include "tracker.h" -#include "fdlimit.h" #include "peer.h" -#include "net.h" #include "inout.h" #include "ratecontrol.h" -#include "clients.h" -#include "choking.h" -#include "natpmp.h" -#include "upnp.h" -#include "http.h" -#include "xml.h" #ifndef TRUE #define TRUE 1 diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c index dfb572304..26efe9e7d 100644 --- a/libtransmission/makemeta.c +++ b/libtransmission/makemeta.c @@ -16,6 +16,7 @@ #include #include /* FILE, snprintf, stderr */ +#include "trcompat.h" /* for strlcpy */ #include "transmission.h" #include "internal.h" /* for tr_torrent_t */ #include "bencode.h" diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c index 4de84a255..33d1cd139 100644 --- a/libtransmission/metainfo.c +++ b/libtransmission/metainfo.c @@ -23,6 +23,9 @@ *****************************************************************************/ #include "transmission.h" +#include "bencode.h" +#include "http.h" /* for tr_httpParseUrl */ +#include "metainfo.h" #define TORRENT_MAX_SIZE (5*1024*1024) diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c index 008498d06..fe998ad27 100644 --- a/libtransmission/natpmp.c +++ b/libtransmission/natpmp.c @@ -23,6 +23,8 @@ *****************************************************************************/ #include "transmission.h" +#include "natpmp.h" +#include "net.h" #define PMP_PORT 5351 #define PMP_MCAST_ADDR "224.0.0.1" diff --git a/libtransmission/net.c b/libtransmission/net.c index 21a994945..29c646f52 100644 --- a/libtransmission/net.c +++ b/libtransmission/net.c @@ -23,6 +23,9 @@ *****************************************************************************/ #include "transmission.h" +#include "fdlimit.h" +#include "net.h" + /*********************************************************************** * DNS resolution diff --git a/libtransmission/peer.c b/libtransmission/peer.c index 42fb3057e..8329a4af9 100644 --- a/libtransmission/peer.c +++ b/libtransmission/peer.c @@ -23,8 +23,11 @@ *****************************************************************************/ #include "transmission.h" +#include "bencode.h" +#include "clients.h" /* for tr_clientForId() */ #include "peertree.h" #include "list.h" +#include "net.h" /***** ****** diff --git a/libtransmission/shared.c b/libtransmission/shared.c index d8c4fbd05..b38639f9f 100644 --- a/libtransmission/shared.c +++ b/libtransmission/shared.c @@ -22,8 +22,13 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include "shared.h" +#include "transmission.h" +#include "choking.h" +#include "natpmp.h" +#include "net.h" #include "peer.h" +#include "shared.h" +#include "upnp.h" /* Maximum number of peers that we keep in our local list */ /* This is an arbitrary number, but it seems to work well */ diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index db98166e3..1731cc890 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -22,7 +22,10 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#include "trcompat.h" /* for strlcpy */ #include "transmission.h" +#include "metainfo.h" +#include "net.h" /* tr_netNtop */ #include "shared.h" /*** diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c index 3c1bc4d9d..0de3cd259 100644 --- a/libtransmission/tracker.c +++ b/libtransmission/tracker.c @@ -23,6 +23,10 @@ *****************************************************************************/ #include "transmission.h" +#include "bencode.h" +#include "bsdqueue.h" +#include "http.h" +#include "net.h" #include "shared.h" struct tclist diff --git a/libtransmission/transmission.c b/libtransmission/transmission.c index ed50f319b..42f7a68d9 100644 --- a/libtransmission/transmission.c +++ b/libtransmission/transmission.c @@ -23,6 +23,8 @@ *****************************************************************************/ #include "transmission.h" +#include "fdlimit.h" +#include "net.h" #include "shared.h" /*********************************************************************** diff --git a/libtransmission/trcompat.h b/libtransmission/trcompat.h index dea9e7061..1c92386de 100644 --- a/libtransmission/trcompat.h +++ b/libtransmission/trcompat.h @@ -24,6 +24,8 @@ #ifndef TRCOMPAT_H #define TRCOMPAT_H +#include /* for size_t */ + #ifndef HAVE_STRLCPY size_t strlcpy(char *dst, const char *src, size_t siz); diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c index 70cc1c863..a7748d87a 100644 --- a/libtransmission/upnp.c +++ b/libtransmission/upnp.c @@ -23,6 +23,10 @@ *****************************************************************************/ #include "transmission.h" +#include "http.h" +#include "net.h" +#include "upnp.h" +#include "xml.h" /* uncomment this to log requests and responses to ~/transmission-upnp.log */ /* #define VERBOSE_LOG */ diff --git a/libtransmission/xml.c b/libtransmission/xml.c index 6d4620507..ca5769d7d 100644 --- a/libtransmission/xml.c +++ b/libtransmission/xml.c @@ -23,6 +23,7 @@ *****************************************************************************/ #include "transmission.h" +#include "xml.h" /* http://www.w3.org/TR/2004/REC-xml-20040204/ */