Changeset 11590

Timestamp:

Dec 24, 2010, 9:11:23 AM (12 years ago)

Author:

charles

Message:

(trunk daemon) #3836 "libevent2 support" -- fix libevent #includes in the daemon/ directory

Location:

trunk/daemon

Files:

• daemon.c (modified) (1 diff)
• remote.c (modified) (3 diffs)
• watch.c (modified) (1 diff)

trunk/daemon/daemon.c

@@ -26 +26 @@
 #include <unistd.h> /* daemon */
 
-#include <event.h>
+#include <event2/buffer.h>
 
 #include <libtransmission/transmission.h>

trunk/daemon/remote.c

@@ -25 +25 @@
 #endif
 
-#include <event.h>
+#include <event2/buffer.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
@@ -1724 +1724 @@
         switch( response ) {
             case 200:
-                status |= processResponse( rpcurl, EVBUFFER_DATA(buf), EVBUFFER_LENGTH(buf) );
+                status |= processResponse( rpcurl, (const char*) evbuffer_pullup( buf, -1 ), evbuffer_get_length( buf ) );
                 break;
             case 409:
@@ -1736 +1736 @@
                 break;
             default:
-                fprintf( stderr, "Unexpected response: %s\n", (char*)EVBUFFER_DATA(buf) );
+                fprintf( stderr, "Unexpected response: %s\n", evbuffer_pullup( buf, -1 ) );
                 status |= EXIT_FAILURE;
                 break;

trunk/daemon/watch.c

@@ -17 +17 @@
   #include <sys/types.h> /* stat */
   #include <sys/stat.h> /* stat */
-  #include <event.h> /* evbuffer */
+  #include <event2/buffer.h> /* evbuffer */
 #endif