Changeset 791 for trunk

Timestamp:

Aug 18, 2006, 8:46:19 AM (16 years ago)

Author:

joshe

Message:

Unbreak BeOS build.

Location:

trunk/libtransmission

Files:

• net.c (modified) (1 diff)
• net.h (modified) (1 diff)
• transmission.c (modified) (5 diffs)

trunk/libtransmission/net.c

@@ -404 +404 @@
 #endif
 }
+
+void tr_netNtop( const struct in_addr * addr, char * buf, int len )
+{
+    const uint8_t * cast;
+
+    cast = (const uint8_t *)addr;
+    snprintf( buf, len, "%hhu.%hhu.%hhu.%hhu",
+              cast[0], cast[1], cast[2], cast[3] );
+}

trunk/libtransmission/net.h

@@ -53 +53 @@
 int  tr_netRecv    ( int s, uint8_t * buf, int size );
 
+void tr_netNtop( const struct in_addr * addr, char * buf, int len );

trunk/libtransmission/transmission.c

@@ -411 +411 @@
 {
     tr_stat_t * s;
+    tr_peer_t * peer;
     tr_info_t * inf = &tor->info;
     int i;
@@ -436 +437 @@
     s->peersDownloading = 0;
     
-    tr_peer_t * peer;
     for( i = 0; i < tor->peerCount; i++ )
     {
@@ -495 +495 @@
 tr_peer_stat_t * tr_torrentPeers( tr_torrent_t * tor, int * peerCount )
 {
+    tr_peer_stat_t * peers;
+
     tr_lockLock( &tor->lock );
 
     *peerCount = tor->peerCount;
     
-    tr_peer_stat_t * peers = (tr_peer_stat_t *) calloc( tor->peerCount, sizeof( tr_peer_stat_t ) );
+    peers = (tr_peer_stat_t *) calloc( tor->peerCount, sizeof( tr_peer_stat_t ) );
     if (peers != NULL)
     {
@@ -512 +514 @@
             if( NULL != addr )
             {
-                inet_ntop( AF_INET, addr, peers[i].addr,
+                tr_netNtop( addr, peers[i].addr,
                            sizeof( peers[i].addr ) );
             }
@@ -531 +533 @@
 void tr_torrentPeersFree( tr_peer_stat_t * peers, int peerCount )
 {
+    int i;
+
     if (peers == NULL)
         return;
 
-    int i;
     for (i = 0; i < peerCount; i++)
         free( peers[i].client );