Changeset 5917 for trunk/libtransmission/peer-io.c

Timestamp:

May 23, 2008, 6:56:42 PM (14 years ago)

Author:

charles

Message:

shave 16 bytes off sizeof(tr_peerIo)

File:

• trunk/libtransmission/peer-io.c (modified) (5 diffs)

trunk/libtransmission/peer-io.c

@@ -42 +42 @@
 **/
 
-struct tr_extensions
-{
-    unsigned int extendedProtocolSupported : 1;
-    unsigned int fastPeersSupported : 1;
-};
-
 struct tr_peerIo
 {
-    struct tr_handle * handle;
-
-    struct in_addr in_addr;
-    int port;
-    int socket;
-    int encryptionMode;
-    int timeout;
-    struct bufferevent * bufev;
-    uint8_t peerId[20];
-    time_t timeCreated;
-
-    tr_extensions extensions;
-
-    unsigned int isEncrypted : 1;
-    unsigned int isIncoming : 1;
-    unsigned int peerIdIsSet : 1;
-
-    tr_can_read_cb     canRead;
-    tr_did_write_cb    didWrite;
-    tr_net_error_cb    gotError;
-    void             * userData;
-
-    tr_crypto * crypto;
+    unsigned int          isEncrypted : 1;
+    unsigned int          isIncoming : 1;
+    unsigned int          peerIdIsSet : 1;
+    unsigned int          extendedProtocolSupported : 1;
+    unsigned int          fastPeersSupported : 1;
+
+    uint8_t               encryptionMode;
+    uint8_t               timeout;
+    uint16_t              port;
+    int                   socket;
+
+    uint8_t               peerId[20];
+    time_t                timeCreated;
+
+    struct tr_handle    * handle;
+
+    struct in_addr        in_addr;
+    struct bufferevent  * bufev;
+
+    tr_can_read_cb        canRead;
+    tr_did_write_cb       didWrite;
+    tr_net_error_cb       gotError;
+    void                * userData;
+
+    tr_crypto           * crypto;
 };
 
@@ -389 +385 @@
     assert( flag==0 || flag==1 );
     
-    io->extensions.extendedProtocolSupported = flag;
+    io->extendedProtocolSupported = flag;
 }
 
@@ -398 +394 @@
     assert( flag==0 || flag==1 );
     
-    io->extensions.fastPeersSupported = flag;
+    io->fastPeersSupported = flag;
 }
 
@@ -406 +402 @@
     assert( io != NULL );
     
-    return io->extensions.extendedProtocolSupported;
+    return io->extendedProtocolSupported;
 }
 
@@ -414 +410 @@
     assert( io != NULL );
     
-    return io->extensions.fastPeersSupported;
+    return io->fastPeersSupported;
 }
 /**