Changeset 6894

Timestamp:

Oct 14, 2008, 1:00:15 AM (13 years ago)

Author:

charles

Message:

(libT) more win32 work copied from spry's code:
(1) add #define for {read,write,strncasecmp} -> {_read,_write,_strnicmp}
(2) fix a couple more variadic macros that didn't get fixed in the last commit
(3) use evutil_strtoll() instead of strtoll()

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (1 diff)
• handshake.c (modified) (1 diff)
• inout.c (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• rpc-server.c (modified) (1 diff)

trunk/libtransmission/bencode.c

@@ -98 +98 @@
 
     errno = 0;
-    val = strtoll( begin, &endptr, 10 );
+    val = evutil_strtoll( begin, &endptr, 10 );
     if( errno || ( endptr != end ) ) /* incomplete parse */
         err = EILSEQ;

trunk/libtransmission/handshake.c

@@ -135 +135 @@
 **/
 
-#define dbgmsg( handshake, fmt... ) tr_deepLog(\
-        __FILE__, __LINE__, tr_peerIoGetAddrStr( handshake->io ), ## fmt )
+#define dbgmsg( handshake, ... ) tr_deepLog(\
+        __FILE__, __LINE__, tr_peerIoGetAddrStr( handshake->io ), __VA_ARGS__ )
 
 static const char*

trunk/libtransmission/inout.c

@@ -37 +37 @@
 #ifdef WIN32
  #define lseek _lseeki64
+ #define read  _read
+ #define write _write
 #endif
 

trunk/libtransmission/peer-io.c

@@ -40 +40 @@
 **/
 
-#define dbgmsg( io, fmt... ) \
-    tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( io ), ## fmt )
+#define dbgmsg( io, ... ) \
+    tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( io ), __VA_ARGS__ )
 
 struct tr_bandwidth

trunk/libtransmission/peer-mgr.c

@@ -134 +134 @@
 };
 
-#define tordbg( t, fmt... ) \
-    tr_deepLog( __FILE__, __LINE__, t->tor->info.name, ## fmt )
-
-#define dbgmsg( fmt... ) \
-    tr_deepLog( __FILE__, __LINE__, NULL, ## fmt )
+#define tordbg( t, ... )
+    tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ )
+
+#define dbgmsg( ... )
+    tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ )
 
 /**

trunk/libtransmission/rpc-server.c

@@ -41 +41 @@
 #define MY_REALM "Transmission"
 #define TR_N_ELEMENTS( ary ) ( sizeof( ary ) / sizeof( *ary ) )
+
+#ifdef WIN32
+#define strncasecmp _strnicmp
+#endif
 
 struct tr_rpc_server