Changeset 2430

Timestamp:

Jul 19, 2007, 11:54:37 AM (16 years ago)

Author:

charles

Message:

simplify xml.c and utils.c's dependencies

Location:

trunk/libtransmission

Files:

• internal.h (modified) (2 diffs)
• torrent.c (modified) (1 diff)
• utils.c (modified) (3 diffs)
• utils.h (modified) (5 diffs)
• xml.c (modified) (1 diff)

trunk/libtransmission/internal.h

@@ -86 +86 @@
 #endif
 
-/* Sometimes the system defines MAX/MIN, sometimes not. In the latter
-   case, define those here since we will use them */
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-#ifndef MIN
-#define MIN(a,b) ((a)>(b)?(b):(a))
-#endif
-
 #define TR_MAX_PEER_COUNT 60
 
 typedef struct tr_completion_s tr_completion_t;
 typedef struct tr_shared_s tr_shared_t;
-typedef struct tr_bitfield_s tr_bitfield_t;
 
 typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t;
@@ -130 +120 @@
 void tr_torrentWriterLock    ( tr_torrent_t * );
 void tr_torrentWriterUnlock  ( tr_torrent_t * );
+
+#define tr_blockPiece(a) _tr_blockPiece(tor,a)
+int _tr_blockPiece( const tr_torrent_t * tor, int block );
+
+#define tr_blockSize(a) _tr_blockSize(tor,a)
+int _tr_blockSize( const tr_torrent_t * tor, int block );
+
+#define tr_blockPosInPiece(a) _tr_blockPosInPiece(tor,a)
+int _tr_blockPosInPiece( const tr_torrent_t * tor, int block );
+
+#define tr_pieceCountBlocks(a) _tr_pieceCountBlocks(tor,a)
+int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece );
+
+#define tr_pieceStartBlock(a) _tr_pieceStartBlock(tor,a)
+int _tr_pieceStartBlock( const tr_torrent_t * tor, int piece );
+
+#define tr_pieceSize(a) _tr_pieceSize(tor,a)
+int _tr_pieceSize( const tr_torrent_t * tor, int piece );
+
+#define tr_block(a,b) _tr_block(tor,a,b)
+int _tr_block( const tr_torrent_t * tor, int index, int begin );
+
 
 typedef enum

trunk/libtransmission/torrent.c

@@ -1335 +1335 @@
         tr_torrentSetFileDL( tor, files[i], doDownload );
 }
+
+/***
+****
+***/
+
+int _tr_blockPiece( const tr_torrent_t * tor, int block )
+{
+    const tr_info_t * inf = &tor->info;
+    return block / ( inf->pieceSize / tor->blockSize );
+}
+
+int _tr_blockSize( const tr_torrent_t * tor, int block )
+{
+    const tr_info_t * inf = &tor->info;
+    int dummy;
+
+    if( block != tor->blockCount - 1 ||
+        !( dummy = inf->totalSize % tor->blockSize ) )
+    {
+        return tor->blockSize;
+    }
+
+    return dummy;
+}
+
+int _tr_blockPosInPiece( const tr_torrent_t * tor, int block )
+{
+    const tr_info_t * inf = &tor->info;
+    return tor->blockSize *
+        ( block % ( inf->pieceSize / tor->blockSize ) );
+}
+
+int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece )
+{
+    const tr_info_t * inf = &tor->info;
+    if( piece < inf->pieceCount - 1 ||
+        !( tor->blockCount % ( inf->pieceSize / tor->blockSize ) ) )
+    {
+        return inf->pieceSize / tor->blockSize;
+    }
+    return tor->blockCount % ( inf->pieceSize / tor->blockSize );
+}
+
+int _tr_pieceStartBlock( const tr_torrent_t * tor, int piece )
+{
+    const tr_info_t * inf = &tor->info;
+    return piece * ( inf->pieceSize / tor->blockSize );
+}
+
+int _tr_pieceSize( const tr_torrent_t * tor, int piece )
+{
+    const tr_info_t * inf = &tor->info;
+    if( piece < inf->pieceCount - 1 ||
+        !( inf->totalSize % inf->pieceSize ) )
+    {
+        return inf->pieceSize;
+    }
+    return inf->totalSize % inf->pieceSize;
+}
+
+int _tr_block( const tr_torrent_t * tor, int index, int begin )
+{
+    const tr_info_t * inf = &tor->info;
+    return index * ( inf->pieceSize / tor->blockSize ) +
+        begin / tor->blockSize;
+}

trunk/libtransmission/utils.c

@@ -24 +24 @@
 
 #include <ctype.h>
+#include <errno.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
@@ -32 +37 @@
 #include "transmission.h"
 #include "trcompat.h"
+#include "utils.h"
+#include "platform.h"
 
 #define SPRINTF_BUFSIZE         100
@@ -696 +703 @@
 #endif
 }
-
-/***
-****
-***/
-
-int _tr_blockPiece( const tr_torrent_t * tor, int block )
-{
-    const tr_info_t * inf = &tor->info;
-    return block / ( inf->pieceSize / tor->blockSize );
-}
-
-int _tr_blockSize( const tr_torrent_t * tor, int block )
-{
-    const tr_info_t * inf = &tor->info;
-    int dummy;
-
-    if( block != tor->blockCount - 1 ||
-        !( dummy = inf->totalSize % tor->blockSize ) )
-    {
-        return tor->blockSize;
-    }
-
-    return dummy;
-}
-
-int _tr_blockPosInPiece( const tr_torrent_t * tor, int block )
-{
-    const tr_info_t * inf = &tor->info;
-    return tor->blockSize *
-        ( block % ( inf->pieceSize / tor->blockSize ) );
-}
-
-int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece )
-{
-    const tr_info_t * inf = &tor->info;
-    if( piece < inf->pieceCount - 1 ||
-        !( tor->blockCount % ( inf->pieceSize / tor->blockSize ) ) )
-    {
-        return inf->pieceSize / tor->blockSize;
-    }
-    return tor->blockCount % ( inf->pieceSize / tor->blockSize );
-}
-
-int _tr_pieceStartBlock( const tr_torrent_t * tor, int piece )
-{
-    const tr_info_t * inf = &tor->info;
-    return piece * ( inf->pieceSize / tor->blockSize );
-}
-
-int _tr_pieceSize( const tr_torrent_t * tor, int piece )
-{
-    const tr_info_t * inf = &tor->info;
-    if( piece < inf->pieceCount - 1 ||
-        !( inf->totalSize % inf->pieceSize ) )
-    {
-        return inf->pieceSize;
-    }
-    return inf->totalSize % inf->pieceSize;
-}
-
-int _tr_block( const tr_torrent_t * tor, int index, int begin )
-{
-    const tr_info_t * inf = &tor->info;
-    return index * ( inf->pieceSize / tor->blockSize ) +
-        begin / tor->blockSize;
-}

trunk/libtransmission/utils.h

@@ -27 +27 @@
 
 #include <stdarg.h>
+#include <stdint.h>
 
 void tr_msgInit( void );
@@ -33 +34 @@
 #define tr_inf( a... ) tr_msg( TR_MSG_INF, ## a )
 #define tr_dbg( a... ) tr_msg( TR_MSG_DBG, ## a )
-void tr_msg  ( int level, char * msg, ... ) PRINTF( 2, 3 );
+void tr_msg  ( int level, char * msg, ... );
 
 int  tr_rand ( int );
@@ -62 +63 @@
  **********************************************************************/
 int tr_sprintf( char ** buf, int * used, int * max,
-                const char * format, ... ) PRINTF( 4, 5 );
+                const char * format, ... );
 /* gee, it sure would be nice if BeOS had va_copy() */
 int tr_vsprintf( char **, int *, int *, const char *, va_list, va_list );
@@ -85 +86 @@
 void tr_wait( uint64_t delay_milliseconds );
 
-#define tr_blockPiece(a) _tr_blockPiece(tor,a)
-int _tr_blockPiece( const tr_torrent_t * tor, int block );
+/***
+****
+***/
 
-#define tr_blockSize(a) _tr_blockSize(tor,a)
-int _tr_blockSize( const tr_torrent_t * tor, int block );
-
-#define tr_blockPosInPiece(a) _tr_blockPosInPiece(tor,a)
-int _tr_blockPosInPiece( const tr_torrent_t * tor, int block );
-
-#define tr_pieceCountBlocks(a) _tr_pieceCountBlocks(tor,a)
-int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece );
-
-#define tr_pieceStartBlock(a) _tr_pieceStartBlock(tor,a)
-int _tr_pieceStartBlock( const tr_torrent_t * tor, int piece );
-
-#define tr_pieceSize(a) _tr_pieceSize(tor,a)
-int _tr_pieceSize( const tr_torrent_t * tor, int piece );
-
-#define tr_block(a,b) _tr_block(tor,a,b)
-int _tr_block( const tr_torrent_t * tor, int index, int begin );
+/* Sometimes the system defines MAX/MIN, sometimes not. In the latter
+   case, define those here since we will use them */
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+#ifndef MIN
+#define MIN(a,b) ((a)>(b)?(b):(a))
+#endif
 
 /***
@@ -129 +122 @@
 ***/
 
-struct tr_bitfield_s
+typedef struct tr_bitfield_s
 {
     uint8_t * bits;
     size_t len;
-};
+}
+tr_bitfield_t;
 
 tr_bitfield_t* tr_bitfieldNew( size_t bitcount );

trunk/libtransmission/xml.c

@@ -23 +23 @@
  *****************************************************************************/
 
-#include "transmission.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "utils.h"
 #include "xml.h"