Changeset 2391

Timestamp:

Jul 18, 2007, 5:25:42 PM (16 years ago)

Author:

joshe

Message:

Include trcompat.h for asprintf()
Don't mix function and non function pointers without casting.
Replace a couple bzero()s with memset()s.
Remove a stray ;
Include a missing header.

Location:

trunk/libtransmission

Files:

• clients.c (modified) (1 diff)
• http.c (modified) (1 diff)
• ipcparse.c (modified) (6 diffs)
• peertree.h (modified) (1 diff)
• platform.c (modified) (1 diff)
• upnp.c (modified) (2 diffs)

trunk/libtransmission/clients.c

@@ -24 +24 @@
 
 #include <ctype.h> /* isprint */
+
 #include "transmission.h"
+#include "trcompat.h"
 
 static int charToInt( char character );

trunk/libtransmission/http.c

@@ -32 +32 @@
 #include "http.h"
 #include "net.h"
+#include "trcompat.h"
 
 #define HTTP_PORT               80      /* default http port 80 */

trunk/libtransmission/ipcparse.c

@@ -241 +241 @@
     {
         RB_INIT( &tree->msgs );
-        tree->def = NULL;
+        tree->def = (trd_msgfunc) NULL;
     }
 
@@ -255 +255 @@
     assert( IPC_MSG_VERSION != id );
 
-    bzero( &key, sizeof key );
+    memset( &key, 0, sizeof key );
     key.id = id;
     entry = RB_FIND( functree, &tree->msgs, &key );
@@ -1115 +1115 @@
     if( NULL != msg && msg->minvers <= info->vers )
     {
-        bzero( &key, sizeof key );
+        memset( &key, 0, sizeof key );
         key.id  = msg->id;
         handler = RB_FIND( functree, &info->funcs->msgs, &key );
@@ -1163 +1163 @@
     assert( MSGVALID( id ) );
 
-    bzero( &key, sizeof key );
+    memset( &key, 0, sizeof key );
     key.id = id;
     return ( NULL != RB_FIND( functree, &info->funcs->msgs, &key ) );
@@ -1219 +1219 @@
     }
 
-    bzero( &key, sizeof key );
+    memset( &key, 0, sizeof key );
     for( jj = 0; list->val.l.count > jj; jj++ )
     {
@@ -1303 +1303 @@
     }
 
-    bzero( &key, sizeof key );
+    memset( &key, 0, sizeof key );
     key.name = name;
     return RB_FIND( msgtree, &tree, &key );

trunk/libtransmission/peertree.h

@@ -47 +47 @@
 }
 
-RB_GENERATE_STATIC( tr_peertree_s, tr_peertree_entry_s, magic, peertreekeycmp );
+RB_GENERATE_STATIC( tr_peertree_s, tr_peertree_entry_s, magic, peertreekeycmp )
 
 static int

trunk/libtransmission/platform.c

@@ -228 +228 @@
     resume_thread( t->thread );
 #else
-    pthread_create( &t->thread, NULL, (void *) ThreadFunc, t );
+    pthread_create( &t->thread, NULL, (void * (*) (void *)) ThreadFunc, t );
 #endif
 }

trunk/libtransmission/upnp.c

@@ -27 +27 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <limits.h>
 #include <stdarg.h>
 
@@ -32 +33 @@
 #include "http.h"
 #include "net.h"
+#include "trcompat.h"
 #include "upnp.h"
 #include "xml.h"