Changeset 1545

Timestamp:

Mar 8, 2007, 4:53:50 AM (15 years ago)

Author:

joshe

Message:

Fix for if unused isn't defined.
Pointless churn to silence char*/unint8_t* warnings.

Location:

branches/pex/libtransmission

Files:

• bencode.c (modified) (2 diffs)
• bencode.h (modified) (1 diff)
• bsdtree.h (modified) (1 diff)
• internal.h (modified) (1 diff)
• peeraz.h (modified) (6 diffs)
• peerext.h (modified) (1 diff)

branches/pex/libtransmission/bencode.c

@@ -283 +283 @@
 }
 
-void tr_bencInitStr( benc_val_t * val, char * str, int len, int nofree )
+void _tr_bencInitStr( benc_val_t * val, char * str, int len, int nofree )
 {
     tr_bencInit( val, TYPE_STR );
@@ -308 +308 @@
     }
 
-    tr_bencInitStr( val, new, 0, 0 );
+    _tr_bencInitStr( val, new, 0, 0 );
 
     return 0;

branches/pex/libtransmission/bencode.h

@@ -72 +72 @@
 }
 
-void   tr_bencInitStr( benc_val_t * val, char * str, int len, int nofree );
+#define tr_bencInitStr( a, b, c, d ) \
+    _tr_bencInitStr( (a), ( char * )(b), (c), (d) )
+void   _tr_bencInitStr( benc_val_t * val, char * str, int len, int nofree );
 int    tr_bencInitStrDup( benc_val_t * val, const char * str );
 void   tr_bencInitInt( benc_val_t * val, int64_t num );

branches/pex/libtransmission/bsdtree.h

@@ -29 +29 @@
 #ifndef _SYS_TREE_H_
 #define _SYS_TREE_H_
+
+#ifndef __unused
+#define __unused
+#endif
 
 /*

branches/pex/libtransmission/internal.h

@@ -100 +100 @@
    char pointers */
 #define TR_NTOHL(p,a) (a) = tr_ntohl((p))
-#define TR_HTONL(a,p) tr_htonl((a), (p))
+#define TR_HTONL(a,p) tr_htonl((a), ( uint8_t * )(p))
 static inline uint32_t tr_ntohl( uint8_t * p )
 {

branches/pex/libtransmission/peeraz.h

@@ -81 +81 @@
 
 static inline int
-azmsgNameIndex( const char *name, int len )
+azmsgNameIndex( const char * name, int len )
 {
     int ii;
@@ -97 +97 @@
 }
 
-static char *
+static uint8_t *
 makeAZHandshake( tr_torrent_t * tor, tr_peer_t * peer, int * buflen )
 {
@@ -195 +195 @@
 
     *buflen = len;
-    return buf;
+    return ( uint8_t * )buf;
 }
 
@@ -245 +245 @@
 sendAZHandshake( tr_torrent_t * tor, tr_peer_t * peer )
 {
-    char * buf;
+    uint8_t * buf;
     int len;
 
@@ -319 +319 @@
     msglen -= off;
 
-    index = azmsgNameIndex( name, namelen );
+    index = azmsgNameIndex( ( char * )name, namelen );
     if( AZ_EXT_VERSION != vers )
     {
@@ -479 +479 @@
         if( TYPE_STR == pair->type && 6 == pair->val.s.i )
         {
-            tr_torrentAddCompact( tor, TR_PEER_FROM_PEX, pair->val.s.s, 1 );
+            tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
+                                  ( uint8_t * )pair->val.s.s, 1 );
         }
     }

branches/pex/libtransmission/peerext.h

@@ -279 +279 @@
     {
         tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
-                              sub->val.s.s, sub->val.s.i / 6 );
+                              ( uint8_t * )sub->val.s.s, sub->val.s.i / 6 );
     }