Changeset 2428

Timestamp:

Jul 19, 2007, 10:49:44 AM (15 years ago)

Author:

charles

Message:

remove the TR_HTONL macro

Location:

trunk/libtransmission

Files:

• internal.h (modified) (1 diff)
• peer.c (modified) (1 diff)
• peeraz.h (modified) (2 diffs)
• peermessages.h (modified) (6 diffs)

trunk/libtransmission/internal.h

@@ -86 +86 @@
 #endif
 
-/* Convenient macros to perform uint32_t endian conversions with
-   char pointers */
-#define TR_HTONL(a,p) tr_htonl((a), ( uint8_t * )(p))
-static inline uint32_t tr_ntohl( uint8_t * p )
-{
-        uint32_t u;
-        memcpy( &u, p, sizeof( uint32_t ) );
-        return ntohl( u );
-}
-static inline void tr_htonl( uint32_t a, uint8_t * p )
-{
-        uint32_t u;
-        u = htonl( a );
-        memcpy ( p, &u, sizeof( uint32_t ) );
-}
-
 /* Sometimes the system defines MAX/MIN, sometimes not. In the latter
    case, define those here since we will use them */

trunk/libtransmission/peer.c

@@ -227 +227 @@
 }
 
+/* utilities for endian conversions with char pointers */
+
+static uint32_t tr_ntohl( const void * p )
+{
+    uint32_t u;
+    memcpy( &u, p, sizeof( uint32_t ) );
+    return ntohl( u );
+}
+static void tr_htonl( uint32_t a, void * p )
+{
+    const uint32_t u = htonl( a );
+    memcpy ( p, &u, sizeof( uint32_t ) );
+}
+
 #include "peerext.h"
 #include "peeraz.h"

trunk/libtransmission/peeraz.h

@@ -115 +115 @@
 
     /* set length to zero for now, we won't know it until after bencoding */
-    TR_HTONL( 0, buf );
+    tr_htonl( 0, buf );
     /* set name length, name, and version */
-    TR_HTONL( azmsgLen( idx ), buf + 4 );
+    tr_htonl( azmsgLen( idx ), buf + 4 );
     memcpy( buf + 8, azmsgStr( idx ), azmsgLen( idx ) );
     buf[8 + azmsgLen( idx )] = AZ_EXT_VERSION;
@@ -188 +188 @@
     tr_bencFree( &val );
     /* we know the length now, fill it in */
-    TR_HTONL( len - 4, buf );
+    tr_htonl( len - 4, buf );
 
     /* XXX is there a way to tell azureus that the public port has changed? */

trunk/libtransmission/peermessages.h

@@ -82 +82 @@
     int index;
 
-    TR_HTONL( size - 4, buf );
+    tr_htonl( size - 4, buf );
     buf += 4;
     if( peer->azproto )
@@ -88 +88 @@
         index = azmsgIdIndex( id );
         assert( 0 <= index );
-        TR_HTONL( azmsgLen( index ), buf );
+        tr_htonl( azmsgLen( index ), buf );
         buf += 4;
         memcpy( buf, azmsgStr( index ), azmsgLen( index ) );
@@ -139 +139 @@
         buf = fillHeader( peer, hdrlen, PEER_MSG_PIECE, peer->outBlock );
 
-        TR_HTONL( r->index, buf );
+        tr_htonl( r->index, buf );
         buf += 4;
-        TR_HTONL( r->begin, buf );
+        tr_htonl( r->begin, buf );
         buf += 4;
 
@@ -262 +262 @@
     p = getMessagePointer( peer, 4, PEER_MSG_HAVE );
 
-    TR_HTONL( piece, p );
+    tr_htonl( piece, p );
 
     peer_dbg( "SEND have %d", piece );
@@ -311 +311 @@
     p = getMessagePointer( peer, 12, PEER_MSG_REQUEST );
 
-    TR_HTONL( r->index,  p     );
-    TR_HTONL( r->begin,  p + 4 );
-    TR_HTONL( r->length, p + 8 );
+    tr_htonl( r->index,  p     );
+    tr_htonl( r->begin,  p + 4 );
+    tr_htonl( r->length, p + 8 );
 
     tr_cpDownloaderAdd( tor->completion, block );
@@ -332 +332 @@
     p = getMessagePointer( peer, 12, PEER_MSG_CANCEL );
 
-    TR_HTONL( index,  p     );
-    TR_HTONL( begin,  p + 4 );
-    TR_HTONL( length, p + 8 );
+    tr_htonl( index,  p     );
+    tr_htonl( begin,  p + 4 );
+    tr_htonl( length, p + 8 );
 
     peer_dbg( "SEND cancel %d/%d (%d bytes)", index, begin, length );