From: Mike Gelfand Date: Tue, 14 Nov 2017 20:21:28 +0000 (+0300) Subject: Ensure include guard is the first non-comment line X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b29fe15561d40c40cbee635446df6b33e18d2c2;p=transmission Ensure include guard is the first non-comment line --- diff --git a/libtransmission/ConvertUTF.h b/libtransmission/ConvertUTF.h index 62e717659..c73b72796 100644 --- a/libtransmission/ConvertUTF.h +++ b/libtransmission/ConvertUTF.h @@ -1,14 +1,14 @@ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /* * Copyright 2001-2004 Unicode, Inc. - * + * * Disclaimer - * + * * This source code is provided as is by Unicode, Inc. No claims are * made as to fitness for any particular purpose. No warranties of any * kind are expressed or implied. The recipient agrees to determine @@ -16,9 +16,9 @@ * purchased on magnetic or optical media from Unicode, Inc., the * sole remedy for any claim will be exchange of defective media * within 90 days of receipt. - * + * * Limitations on Rights to Redistribute This Code - * + * * Unicode, Inc. hereby grants the right to freely use the information * supplied in this file in the creation of products supporting the * Unicode Standard, and to make copies of this file in any form @@ -39,7 +39,7 @@ Each routine converts the text between *sourceStart and sourceEnd, putting the result into the buffer between *targetStart and - targetEnd. Note: the end pointers are *after* the last item: e.g. + targetEnd. Note: the end pointers are *after* the last item: e.g. * (sourceEnd - 1) is the last item. The return result indicates whether the conversion was successful, @@ -77,7 +77,7 @@ sequence is malformed. When "sourceIllegal" is returned, the source value will point to the illegal value that caused the problem. E.g., in UTF-8 when a sequence is malformed, it points to the start of the - malformed sequence. + malformed sequence. Author: Mark E. Davis, 1994. Rev History: Rick McGowan, fixes & updates May 2001. @@ -123,27 +123,27 @@ extern "C" { #endif ConversionResult ConvertUTF8toUTF16 ( - const UTF8** sourceStart, const UTF8* sourceEnd, + const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF16toUTF8 ( - const UTF16** sourceStart, const UTF16* sourceEnd, + const UTF16** sourceStart, const UTF16* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); - + ConversionResult ConvertUTF8toUTF32 ( - const UTF8** sourceStart, const UTF8* sourceEnd, + const UTF8** sourceStart, const UTF8* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF32toUTF8 ( - const UTF32** sourceStart, const UTF32* sourceEnd, + const UTF32** sourceStart, const UTF32* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); - + ConversionResult ConvertUTF16toUTF32 ( - const UTF16** sourceStart, const UTF16* sourceEnd, + const UTF16** sourceStart, const UTF16* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF32toUTF16 ( - const UTF32** sourceStart, const UTF32* sourceEnd, + const UTF32** sourceStart, const UTF32* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); Boolean isLegalUTF8Sequence (const UTF8 *source, const UTF8 *sourceEnd); diff --git a/libtransmission/announcer-common.h b/libtransmission/announcer-common.h index cf62ce745..03562adbe 100644 --- a/libtransmission/announcer-common.h +++ b/libtransmission/announcer-common.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __LIBTRANSMISSION_ANNOUNCER_MODULE__ #error only the libtransmission announcer module should #include this header. #endif -#pragma once - #include "transmission.h" /* SHA_DIGEST_LENGTH */ #include "session.h" /* PEER_ID_LEN */ diff --git a/libtransmission/announcer-udp.c b/libtransmission/announcer-udp.c index 4b905bdda..c70a44f04 100644 --- a/libtransmission/announcer-udp.c +++ b/libtransmission/announcer-udp.c @@ -6,8 +6,6 @@ * */ -#define __LIBTRANSMISSION_ANNOUNCER_MODULE__ - #include /* errno, EAFNOSUPPORT */ #include /* memcpy(), memset() */ @@ -15,6 +13,8 @@ #include #include +#define __LIBTRANSMISSION_ANNOUNCER_MODULE__ + #include "transmission.h" #include "announcer.h" #include "announcer-common.h" diff --git a/libtransmission/announcer.h b/libtransmission/announcer.h index 1b94eb2d6..4df805663 100644 --- a/libtransmission/announcer.h +++ b/libtransmission/announcer.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" struct tr_announcer; diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h index 9a9e34f47..db1e4e1be 100644 --- a/libtransmission/bandwidth.h +++ b/libtransmission/bandwidth.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "ptrarray.h" #include "tr-assert.h" diff --git a/libtransmission/bitfield.h b/libtransmission/bitfield.h index 08fdd00cf..0c56d24e3 100644 --- a/libtransmission/bitfield.h +++ b/libtransmission/bitfield.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" /** @brief Implementation of the BitTorrent spec's Bitfield array of bits */ diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h index 8c547b104..1a69c4cef 100644 --- a/libtransmission/blocklist.h +++ b/libtransmission/blocklist.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - struct tr_address; typedef struct tr_blocklistFile tr_blocklistFile; diff --git a/libtransmission/cache.h b/libtransmission/cache.h index fe900bdc5..7cceedcb9 100644 --- a/libtransmission/cache.h +++ b/libtransmission/cache.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - struct evbuffer; typedef struct tr_cache tr_cache; diff --git a/libtransmission/clients.h b/libtransmission/clients.h index 65d3c6c29..ef85a7486 100644 --- a/libtransmission/clients.h +++ b/libtransmission/clients.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @brief parse a peer-id into a human-readable client name and version number * @ingroup utils diff --git a/libtransmission/completion.h b/libtransmission/completion.h index f72885867..b167292ed 100644 --- a/libtransmission/completion.h +++ b/libtransmission/completion.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "bitfield.h" #include "utils.h" /* tr_getRatio() */ diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h index d2d833c7d..7e6c85d42 100644 --- a/libtransmission/crypto.h +++ b/libtransmission/crypto.h @@ -6,13 +6,13 @@ * */ +#ifndef TR_ENCRYPTION_H +#define TR_ENCRYPTION_H + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#ifndef TR_ENCRYPTION_H -#define TR_ENCRYPTION_H - #include #include "crypto-utils.h" diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h index caa15b31f..ab3a4503f 100644 --- a/libtransmission/fdlimit.h +++ b/libtransmission/fdlimit.h @@ -6,6 +6,8 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h index 71922dc72..593e3c489 100644 --- a/libtransmission/handshake.h +++ b/libtransmission/handshake.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "net.h" diff --git a/libtransmission/history.h b/libtransmission/history.h index 5a66bd47d..e2b898dd0 100644 --- a/libtransmission/history.h +++ b/libtransmission/history.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * A generic short-term memory object that remembers how many times * something happened over the last N seconds. diff --git a/libtransmission/inout.h b/libtransmission/inout.h index 3271412f3..616191ae8 100644 --- a/libtransmission/inout.h +++ b/libtransmission/inout.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - struct tr_torrent; /** diff --git a/libtransmission/json-test.c b/libtransmission/json-test.c index a8cc4cc9f..9652e9cc3 100644 --- a/libtransmission/json-test.c +++ b/libtransmission/json-test.c @@ -11,6 +11,7 @@ #include /* setlocale() */ #define __LIBTRANSMISSION_VARIANT_MODULE__ + #include "transmission.h" #include "utils.h" /* tr_free */ #include "variant.h" diff --git a/libtransmission/list.h b/libtransmission/list.h index b671941e9..665f29e79 100644 --- a/libtransmission/list.h +++ b/libtransmission/list.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @addtogroup utils Utilities * @{ diff --git a/libtransmission/magnet.h b/libtransmission/magnet.h index 5e2960d8f..df5393304 100644 --- a/libtransmission/magnet.h +++ b/libtransmission/magnet.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "variant.h" diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h index 375453704..ee00df57a 100644 --- a/libtransmission/metainfo.h +++ b/libtransmission/metainfo.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "variant.h" diff --git a/libtransmission/natpmp_local.h b/libtransmission/natpmp_local.h index af5564b5d..4f5a55751 100644 --- a/libtransmission/natpmp_local.h +++ b/libtransmission/natpmp_local.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @addtogroup port_forwarding Port Forwarding * @{ diff --git a/libtransmission/net.h b/libtransmission/net.h index 82577a04e..66b3449e7 100644 --- a/libtransmission/net.h +++ b/libtransmission/net.h @@ -20,12 +20,12 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #ifdef _WIN32 #include #include diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h index a7c8fe93c..59fefe590 100644 --- a/libtransmission/peer-common.h +++ b/libtransmission/peer-common.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "bitfield.h" #include "history.h" diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h index 471633128..0749e9b68 100644 --- a/libtransmission/peer-io.h +++ b/libtransmission/peer-io.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** *** **/ diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h index 8f0c53c02..5191e966d 100644 --- a/libtransmission/peer-mgr.h +++ b/libtransmission/peer-mgr.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include /* uint16_t */ #ifdef _WIN32 diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h index d44fd38d7..f5d1a3880 100644 --- a/libtransmission/peer-msgs.h +++ b/libtransmission/peer-msgs.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include #include "peer-common.h" diff --git a/libtransmission/platform-quota.h b/libtransmission/platform-quota.h index 1eb7d3b1c..83597c379 100644 --- a/libtransmission/platform-quota.h +++ b/libtransmission/platform-quota.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @addtogroup tr_session Session * @{ diff --git a/libtransmission/platform.h b/libtransmission/platform.h index 802b76a22..4cffc5e52 100644 --- a/libtransmission/platform.h +++ b/libtransmission/platform.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #define TR_PATH_DELIMITER '/' #define TR_PATH_DELIMITER_STR "/" diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h index 9381b80d6..6aef55dff 100644 --- a/libtransmission/port-forwarding.h +++ b/libtransmission/port-forwarding.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" /** diff --git a/libtransmission/ptrarray.h b/libtransmission/ptrarray.h index de76d3851..5b0c5d5c7 100644 --- a/libtransmission/ptrarray.h +++ b/libtransmission/ptrarray.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "transmission.h" #include "tr-assert.h" diff --git a/libtransmission/resume.h b/libtransmission/resume.h index 64e97736c..ea4e48cc5 100644 --- a/libtransmission/resume.h +++ b/libtransmission/resume.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - enum { TR_FR_DOWNLOADED = (1 << 0), diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h index cacaed1bc..46e8a871f 100644 --- a/libtransmission/rpc-server.h +++ b/libtransmission/rpc-server.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "variant.h" typedef struct tr_rpc_server tr_rpc_server; diff --git a/libtransmission/session.h b/libtransmission/session.h index 9499507f9..4ccf7fe46 100644 --- a/libtransmission/session.h +++ b/libtransmission/session.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #define TR_NAME "Transmission" #include "bandwidth.h" diff --git a/libtransmission/stats.h b/libtransmission/stats.h index 1c2c05451..298250a4d 100644 --- a/libtransmission/stats.h +++ b/libtransmission/stats.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - extern struct tr_session_stats const TR_SESSION_STATS_INIT; void tr_statsInit(tr_session* session); diff --git a/libtransmission/torrent-magnet.h b/libtransmission/torrent-magnet.h index ef1e84d26..0d63e5ed7 100644 --- a/libtransmission/torrent-magnet.h +++ b/libtransmission/torrent-magnet.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include #include diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index 52c2efcf1..522019292 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - #include "bandwidth.h" /* tr_bandwidth */ #include "completion.h" /* tr_completion */ #include "session.h" /* tr_sessionLock(), tr_sessionUnlock() */ diff --git a/libtransmission/tr-dht.h b/libtransmission/tr-dht.h index 2eef43bbd..5c8c4b4dc 100644 --- a/libtransmission/tr-dht.h +++ b/libtransmission/tr-dht.h @@ -22,6 +22,8 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif diff --git a/libtransmission/tr-lpd.h b/libtransmission/tr-lpd.h index e4192a3ec..e93e612a9 100644 --- a/libtransmission/tr-lpd.h +++ b/libtransmission/tr-lpd.h @@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - int tr_lpdInit(tr_session*, tr_address*); void tr_lpdUninit(tr_session*); bool tr_lpdEnabled(tr_session const*); diff --git a/libtransmission/tr-utp.h b/libtransmission/tr-utp.h index 4aae573c5..9e07c86bb 100644 --- a/libtransmission/tr-utp.h +++ b/libtransmission/tr-utp.h @@ -21,12 +21,12 @@ THE SOFTWARE. */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - int tr_utpPacket(unsigned char const* buf, size_t buflen, struct sockaddr const* from, socklen_t fromlen, tr_session* ss); void tr_utpClose(tr_session*); diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h index cd28db811..bf11ad171 100644 --- a/libtransmission/trevent.h +++ b/libtransmission/trevent.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** **/ diff --git a/libtransmission/upnp.h b/libtransmission/upnp.h index ace7f1de8..f5dcf6a42 100644 --- a/libtransmission/upnp.h +++ b/libtransmission/upnp.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @addtogroup port_forwarding Port Forwarding * @{ diff --git a/libtransmission/variant-benc.c b/libtransmission/variant-benc.c index cb1c7fbef..9a7faf7d9 100644 --- a/libtransmission/variant-benc.c +++ b/libtransmission/variant-benc.c @@ -16,6 +16,7 @@ #include "ConvertUTF.h" #define __LIBTRANSMISSION_VARIANT_MODULE__ + #include "transmission.h" #include "ptrarray.h" #include "utils.h" /* tr_snprintf() */ diff --git a/libtransmission/variant-common.h b/libtransmission/variant-common.h index ff5aff8ed..8e10634d1 100644 --- a/libtransmission/variant-common.h +++ b/libtransmission/variant-common.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __LIBTRANSMISSION_VARIANT_MODULE__ #error only libtransmission/variant-*.c should #include this header. #endif -#pragma once - typedef void (* VariantWalkFunc)(tr_variant const* val, void* user_data); struct VariantWalkFuncs diff --git a/libtransmission/variant-json.c b/libtransmission/variant-json.c index 22cb616e9..9e62668e7 100644 --- a/libtransmission/variant-json.c +++ b/libtransmission/variant-json.c @@ -20,6 +20,7 @@ #include "jsonsl.c" #define __LIBTRANSMISSION_VARIANT_MODULE__ + #include "transmission.h" #include "ConvertUTF.h" #include "list.h" diff --git a/libtransmission/variant-test.c b/libtransmission/variant-test.c index c42606241..b734444ec 100644 --- a/libtransmission/variant-test.c +++ b/libtransmission/variant-test.c @@ -13,6 +13,7 @@ #include #define __LIBTRANSMISSION_VARIANT_MODULE__ + #include "transmission.h" #include "utils.h" /* tr_free */ #include "variant.h" diff --git a/libtransmission/variant.c b/libtransmission/variant.c index b45e2458c..628cd8cd4 100644 --- a/libtransmission/variant.c +++ b/libtransmission/variant.c @@ -32,6 +32,7 @@ #include #define __LIBTRANSMISSION_VARIANT_MODULE__ + #include "transmission.h" #include "ConvertUTF.h" #include "error.h" diff --git a/libtransmission/verify.h b/libtransmission/verify.h index edcd28b29..e6abde386 100644 --- a/libtransmission/verify.h +++ b/libtransmission/verify.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - /** * @addtogroup file_io File IO * @{ diff --git a/libtransmission/webseed.h b/libtransmission/webseed.h index 82b986b63..7be5cecda 100644 --- a/libtransmission/webseed.h +++ b/libtransmission/webseed.h @@ -6,12 +6,12 @@ * */ +#pragma once + #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif -#pragma once - typedef struct tr_webseed tr_webseed; #include "peer-common.h"