Changeset 3606

Timestamp:

Oct 27, 2007, 9:29:41 PM (15 years ago)

Author:

charles

Message:

compatability with older C copmilers (ticket #422, patch by fizz)

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• gtk/tr_torrent.c (modified) (1 diff)
• libtransmission/handshake.c (modified) (1 diff)
• libtransmission/inout.c (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (4 diffs)
• libtransmission/peer-msgs.c (modified) (2 diffs)

trunk/configure.ac

@@ -36 +36 @@
 AC_SEARCH_LIBS([socket], [socket net])
 AC_SEARCH_LIBS([gethostbyname], [nsl bind])
+
+dnl ----------------------------------------------------------------------------
+dnl
+dnl va_copy
+
+AC_MSG_CHECKING([how to copy va_list])
+AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
+    AC_MSG_RESULT([va_copy]),
+        [ AH_TEMPLATE([va_copy], [define if va_copy is not available])
+        AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; __va_copy(ap1, ap2);],
+        [ AC_DEFINE([va_copy], [__va_copy])
+        AC_MSG_RESULT([__va_copy])],
+        [ AC_DEFINE([va_copy(dest,src)], [memcpy(&dest,&src,sizeof(va_list))])
+        AC_MSG_RESULT([memcpy])]
+    )
+])
+
 
 dnl ----------------------------------------------------------------------------

trunk/gtk/tr_torrent.c

@@ -178 +178 @@
 maketorrent( tr_torrent * handle )
 {
+    TrTorrent * tor = g_object_new( TR_TORRENT_TYPE, NULL );
     tr_torrentDisablePex( handle, !pref_flag_get( PREF_KEY_PEX ) );
-    TrTorrent * tor = g_object_new( TR_TORRENT_TYPE, NULL );
     tor->handle = handle;
     return tor;

trunk/libtransmission/handshake.c

@@ -969 +969 @@
         && ( !tr_peerIoReconnect( handshake->io ) ) )
     {
+        int msgSize; 
+        uint8_t * msg;
         dbgmsg( handshake, "handshake failed, trying plaintext..." );
-        int msgSize; 
-        uint8_t * msg = buildHandshakeMessage( handshake, &msgSize );
+        msg = buildHandshakeMessage( handshake, &msgSize );
         handshake->haveSentBitTorrentHandshake = 1;
         setReadState( handshake, AWAITING_HANDSHAKE );

trunk/libtransmission/inout.c

@@ -428 +428 @@
     {
         struct recheck_node tmp;
+        struct recheck_node * node;
         tmp.torrent = tor;
-        struct recheck_node * node = tr_list_remove( &recheckList,
-                                                     &tmp,
-                                                     compareRecheckByTorrent );
+        node = tr_list_remove( &recheckList,
+                               &tmp,
+                               compareRecheckByTorrent );
         tr_free( node );
         tor->recheckState = TR_RECHECK_NONE;

trunk/libtransmission/peer-mgr.c

@@ -442 +442 @@
      * so that being on same local network gives us the same allowed pieces */
     
+    uint8_t *seed;
+    char buf[4];
+    uint32_t allowedPieceCount = 0;
+    tr_bitfield_t * ret;
+
     printf( "%d piece allowed fast set for torrent with %d pieces and hex infohash\n", setCount, pieceCount );
     printf( "%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x for node with IP %s:\n",
@@ -448 +453 @@
             inet_ntoa( *ip ) );
     
-    uint8_t *seed = malloc(4 + SHA_DIGEST_LENGTH);
-    char buf[4];
-    uint32_t allowedPieceCount = 0;
-    tr_bitfield_t * ret;
+    seed = malloc(4 + SHA_DIGEST_LENGTH);
     
     ret = tr_bitfieldNew( pieceCount );
@@ -1691 +1693 @@
         {
             tr_peerMgr * mgr = t->manager;
-
             struct peer_atom * atom = candidates[i];
-
             tr_peerIo * io;
+            tr_handshake * handshake;
 
             tordbg( t, "Starting an OUTGOING connection with %s",
@@ -1701 +1702 @@
             io = tr_peerIoNewOutgoing( mgr->handle, &atom->addr, atom->port, t->hash );
 
-            tr_handshake * handshake = tr_handshakeNew( io,
-                                                        mgr->handle->encryptionMode,
-                                                        myHandshakeDoneCB,
-                                                        mgr );
+            handshake = tr_handshakeNew( io,
+                                         mgr->handle->encryptionMode,
+                                         myHandshakeDoneCB,
+                                         mgr );
 
             assert( tr_peerIoGetTorrentHash( io ) != NULL );

trunk/libtransmission/peer-msgs.c

@@ -1693 +1693 @@
     else {
         /* This peer is fastpeer-enabled, send it have-all or have-none if appropriate */
+        uint32_t peerProgress;
         float completion = tr_cpPercentComplete( m->torrent->completion );
         if ( completion == 0.0f ) {
@@ -1701 +1702 @@
             sendBitfield( m );
         }
-        uint32_t peerProgress = m->torrent->info.pieceCount * m->info->progress;
+        peerProgress = m->torrent->info.pieceCount * m->info->progress;
         
         if ( peerProgress < MAX_ALLOWED_SET_COUNT )