(libT) add #ifdefs to ensure that client apps don't #include private libtransmission...

diff --git a/cli/cli.c b/cli/cli.c
index 66e18d7668e743684afad804617894df174a8f9c..ced3deca4b9aaa967c7e159281c052529ca36ec3 100644 (file)
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -31,7 +31,6 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
 #include <libtransmission/makemeta.h>
-#include <libtransmission/metainfo.h> /* tr_metainfoFree */
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h> /* tr_wait */
 #include <libtransmission/web.h> /* tr_webRun */

diff --git a/daemon/daemon.c b/daemon/daemon.c
index fad29becee490c8fc9bb9d76749c6089cceb27e7..14f2c7cd931f2a22b29829e08bdf1722016ec2b2 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -22,7 +22,6 @@
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
-#include <libtransmission/rpcimpl.h>
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h>
 #include <libtransmission/version.h>

diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h
index ba8ca8e8b0e2fd4e3635c99cbdc8a50da600797f..2f7f56aa5576dca002cec42ae804dcc44ce74d85 100644 (file)
--- a/libtransmission/bandwidth.h
+++ b/libtransmission/bandwidth.h
@@ -10,6 +10,10 @@
  * $Id:$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_BANDWIDTH_H
 #define TR_BANDWIDTH_H
 

diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index 7b285b34d4daed8a54fb092fd709f3f58a2fa52e..c4b1e76e428e7495412f549a52714f9f1b95b122 100644 (file)
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_BLOCKLIST_H
 #define TR_BLOCKLIST_H
 

diff --git a/libtransmission/completion.h b/libtransmission/completion.h
index a707e08f8c946725fe04a313327decdcfe7a93c0..071adea317e2e0bb7bbfd02a32947d24015cde51 100644 (file)
--- a/libtransmission/completion.h
+++ b/libtransmission/completion.h
@@ -25,6 +25,10 @@
 #ifndef TR_COMPLETION_H
 #define TR_COMPLETION_H
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include "transmission.h"
 
 struct tr_bitfield;

diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
index b44e9b437abf031dd646ceeed3741560ef02eb22..f8dec9d3fe182ec5987b0b60e2d44cb38125df3a 100644 (file)
--- a/libtransmission/crypto.h
+++ b/libtransmission/crypto.h
@@ -13,6 +13,10 @@
 #ifndef TR_ENCRYPTION_H
 #define TR_ENCRYPTION_H
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include <inttypes.h>
 
 #include "utils.h" /* TR_GNUC_NULL_TERMINATED */

diff --git a/libtransmission/fastresume.h b/libtransmission/fastresume.h
index efd1c67669130971f1df1c64fe0180bdeeb46f18..0c86cf63695e7d21b10720d3283090e49196716f 100644 (file)
--- a/libtransmission/fastresume.h
+++ b/libtransmission/fastresume.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_FAST_RESUME_H
 #define TR_FAST_RESUME_H
 

diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h
index 8865427b55a648da47ba6a86ab6fb2cb493b0413..345d793c7d23e0c631db85c65fa0eed665d975b9 100644 (file)
--- a/libtransmission/fdlimit.h
+++ b/libtransmission/fdlimit.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include "net.h"
 
 /***********************************************************************

diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h
index 9f9c529aaac27812af0b509359ef81284bd5b5f9..8fc68a763ea8e03527f2f25dce7f832d5919f60f 100644 (file)
--- a/libtransmission/handshake.h
+++ b/libtransmission/handshake.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_HANDSHAKE_H
 #define TR_HANDSHAKE_H
 

diff --git a/libtransmission/inout.h b/libtransmission/inout.h
index 6b96cdbd77fb73d7d14271f04270a2c2769eace9..eb7b3d999bac0de2b1954699ba3274a7b334a5ba 100644 (file)
--- a/libtransmission/inout.h
+++ b/libtransmission/inout.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_IO_H
 #define TR_IO_H 1
 

diff --git a/libtransmission/list.h b/libtransmission/list.h
index a14f7533e32626826892b529b103b2ce85ca408e..4e2eec7093d643ac309582febd4f8060497664ac 100644 (file)
--- a/libtransmission/list.h
+++ b/libtransmission/list.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_LIST_H
 #define TR_LIST_H
 

diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
index fa7bab79403163e68e573c48179ad64def8a46f1..5738cdc31d0cd8929dc2678d222662f6fd171571 100644 (file)
--- a/libtransmission/metainfo.h
+++ b/libtransmission/metainfo.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_METAINFO_H
 #define TR_METAINFO_H 1
 
@@ -37,8 +41,6 @@ int  tr_metainfoParse( const tr_handle *      handle,
                        tr_info *              info,
                        const struct tr_benc * benc );
 
-void tr_metainfoFree( tr_info * inf );
-
 void tr_metainfoRemoveSaved( const tr_handle * handle,
                              const tr_info *   info );
 

diff --git a/libtransmission/natpmp.h b/libtransmission/natpmp.h
index 872db4fb1cf6c22119252539ee0744e388057a72..d2a38775251b1030a44a23419034b9a124948d1a 100644 (file)
--- a/libtransmission/natpmp.h
+++ b/libtransmission/natpmp.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_NATPMP_H
 #define TR_NATPMP_H 1
 

diff --git a/libtransmission/net.h b/libtransmission/net.h
index 5fa26d5e3848fee0cfa819ca3ef575edb8c14999..272f5f195b1e1aa6e567ab7d23171c3c9231f538 100644 (file)
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_NET_H_
 #define _TR_NET_H_
 

diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index d262845c03a720853ec3cd02a83b23d9f97fc983..3e5080a01e8c3b2c8a2135e8b9f694a9da486fcc 100644 (file)
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_H
 #define TR_PEER_H
 

diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index cdfd9bb3607992867c57972d44c010ba6f75bcfc..598b4f06f0477477c70295d8621f3353fbff620c 100644 (file)
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_IO_H
 #define TR_PEER_IO_H
 

diff --git a/libtransmission/peer-mgr-private.h b/libtransmission/peer-mgr-private.h
index bc68cf3b31a57f20e73318d1261073ec7b1f2ba6..ad652c941f708963da17860c3c1874e87de09084 100644 (file)
--- a/libtransmission/peer-mgr-private.h
+++ b/libtransmission/peer-mgr-private.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MGR_PRIVATE_H
 #define TR_PEER_MGR_PRIVATE_H
 

diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 13f45cd25863364c44c79389aeeaa9fb27ac4535..d04d8646ca513ab9a7b7dbcbbb2b5a9e8b2e6f7d 100644 (file)
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MGR_H
 #define TR_PEER_MGR_H
 

diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 98aa08e5396acde4304e899dbb145abf08abad01..c8301452f25868051d50b83a403c01a6ed03d819 100644 (file)
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MSGS_H
 #define TR_PEER_MSGS_H
 

diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h
index cbdad4640eb14cdceda1fec20d671aa48cd579f8..19d698d37940b0e7d2e50359cf5d399371f25486 100644 (file)
--- a/libtransmission/port-forwarding.h
+++ b/libtransmission/port-forwarding.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef SHARED_H
 #define SHARED_H 1
 

diff --git a/libtransmission/ptrarray.h b/libtransmission/ptrarray.h
index d86acc75ed16dbc77dc21852a2a2fa98f1c7c7fb..79341d81865e2cb28de0bda1448060ab7d77a34c 100644 (file)
--- a/libtransmission/ptrarray.h
+++ b/libtransmission/ptrarray.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_PTR_ARRAY_H_
 #define _TR_PTR_ARRAY_H_
 

diff --git a/libtransmission/publish.h b/libtransmission/publish.h
index 42b644fe4a7d400d420934fcea2d48be1fb675f1..6421ba79502392c8b66885e41b0c367f502c3658 100644 (file)
--- a/libtransmission/publish.h
+++ b/libtransmission/publish.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_PUBLISHER_H_
 #define _TR_PUBLISHER_H_
 

diff --git a/libtransmission/ratecontrol.h b/libtransmission/ratecontrol.h
index 32d690c2cc96fad034d2f2b97b04af2a743a38f3..7289eb4befa803a8841fbe03cd58f0cd0ef2a11d 100644 (file)
--- a/libtransmission/ratecontrol.h
+++ b/libtransmission/ratecontrol.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_RATECONTROL_H_
 #define _TR_RATECONTROL_H_
 

diff --git a/libtransmission/resume.h b/libtransmission/resume.h
index d3d1465e1032a858543923e3d61b13ccd09c1120..db1f9fd253e8ffe663348ae9e9eff15f9a391a5d 100644 (file)
--- a/libtransmission/resume.h
+++ b/libtransmission/resume.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_RESUME_H
 #define TR_RESUME_H
 

diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
index b21833e2eba5adb4a6a46774c40d2d8e207f1b16..94429d8f6d254d04c659d26f23d158cf9ffa6f3b 100644 (file)
--- a/libtransmission/rpc-server.h
+++ b/libtransmission/rpc-server.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_RPC_SERVER_H
 #define TR_RPC_SERVER_H
 

diff --git a/libtransmission/session.h b/libtransmission/session.h
index 02092d40b4d5f97df240d432cbbf68402be92f45..f7fde96ba13365854af75ada5880d8b085f3cf2c 100644 (file)
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_INTERNAL_H
 #define TR_INTERNAL_H 1
 

diff --git a/libtransmission/stats.h b/libtransmission/stats.h
index 262a676eb799131828a4424693b36f18a2fea7bb..cb82ab996351957446777fd70b5c44e7d4bfe61f 100644 (file)
--- a/libtransmission/stats.h
+++ b/libtransmission/stats.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_STATS_H
 #define TR_STATS_H
 

diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 2b3429b519177e3f9ae2be15b462d488dfb9b228..da50ae8e5f79f95d4b8912426dc5d1f93a549933 100644 (file)
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_TORRENT_H
 #define TR_TORRENT_H 1
 

diff --git a/libtransmission/tracker.h b/libtransmission/tracker.h
index 7f14e665813d8cd1ef6b6a5dad665e429f8b009d..c40b2f0c8c153e0a4bc41876ddf81561ea84d471 100644 (file)
--- a/libtransmission/tracker.h
+++ b/libtransmission/tracker.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_TRACKER_H_
 #define _TR_TRACKER_H_
 

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 4a792ac5ff5cbbed1388711f31e17ba5c660bf6b..1f741511ead26c6af4193651acd5150706c75cc0 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -806,6 +806,11 @@ int tr_torrentParse( const tr_session  * session,
                      const tr_ctor     * ctor,
                      tr_info           * setme_info_or_NULL );
 
+/** @brief free a metainfo
+    @see tr_torrentParse */
+void tr_metainfoFree( tr_info * inf );
+
+
 /** Instantiate a single torrent.
     @return 0 on success,
             TR_EINVALID if the torrent couldn't be parsed, or

diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h
index 318278afabc4e0d9d12e0043b558401eabe6e1fc..058c97d268ca944cc3f6f215ef393ea99576be19 100644 (file)
--- a/libtransmission/trevent.h
+++ b/libtransmission/trevent.h
@@ -10,7 +10,12 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_EVENT_H
+#define TR_EVENT_H
 
 #include <stddef.h> /* size_t */
 #include <inttypes.h> /* uint64_t */

diff --git a/libtransmission/upnp.h b/libtransmission/upnp.h
index 263285721d2baab17ca9ad73ca4cc460abff030a..af4aaafbdd19a68775159a5d35580abc645ceb92 100644 (file)
--- a/libtransmission/upnp.h
+++ b/libtransmission/upnp.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_UPNP_H
 #define TR_UPNP_H 1
 

diff --git a/libtransmission/verify.h b/libtransmission/verify.h
index d634cb7be9c477224e78f8f0f4f27077674e9583..97c1bdcbc8b887d7967ca9cf2537a69e30163313 100644 (file)
--- a/libtransmission/verify.h
+++ b/libtransmission/verify.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_VERIFY_H
 #define TR_VERIFY_H 1
 

diff --git a/libtransmission/webseed.h b/libtransmission/webseed.h
index eeba6f4b77a79c56dbb26bfe6d4e3654a35306de..e5a2ebb7a61a78cb1db0f44fa1ddcc02d422b6ba 100644 (file)
--- a/libtransmission/webseed.h
+++ b/libtransmission/webseed.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_WEBSEED_H
 #define TR_WEBSEED_H
 

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9cda81a3c856317fd7ee42756259fcf1f82ee9cb..9b1258c5c2038ec71d24108c432333c95353278d 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -48,7 +48,6 @@
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
 #import "SpeedLimitToTurtleIconTransformer.h"
-#import "metainfo.h"
 #import "utils.h"
 
 #import "UKKQueue.h"

diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index 8814dafc9472264164b31da3d0cde113cfd71ec3..a440287616c250c38171dd64b35aac2646f2ad21 100644 (file)
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -25,7 +25,6 @@
 #import "DragOverlayWindow.h"
 #import "DragOverlayView.h"
 #import "NSStringAdditions.h"
-#import "metainfo.h"
 
 @implementation DragOverlayWindow
 

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 33b9e4d815b1fab26b98fbfeab0759dafbd83f78..4f6b64bed6489c64a7cfa8fd47ba738572088784 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -27,7 +27,6 @@
 #import "FileListNode.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#import "metainfo.h"
 #import "utils.h" //tr_httpIsValidURL
 
 @interface Torrent (Private)