Changeset 7405 for trunk/libtransmission/platform.c

Timestamp:

Dec 16, 2008, 12:57:24 AM (12 years ago)

Author:

charles

Message:

(trunk libT) fix build error reported by KyleK and hudson-t

File:

• trunk/libtransmission/platform.c (modified) (3 diffs)

trunk/libtransmission/platform.c

@@ -44 +44 @@
 #include "platform.h"
 #include "utils.h"
-
-#include <event.h>
 
 /***
@@ -556 +554 @@
             /* XDG_DATA_DIRS are the backup directories */
             {
-                struct evbuffer * buf = evbuffer_new( );
-                evbuffer_add_printf( buf, "%s:", PACKAGE_DATA_DIR );
-                if(( tmp = getenv( "XDG_DATA_DIRS" )))
-                    evbuffer_add_printf( buf, "%s:", tmp );
-                evbuffer_add_printf( buf, "%s:", "/usr/local/share" );
-                evbuffer_add_printf( buf, "%s:", "/usr/share" );
-                tmp = (const char*) EVBUFFER_DATA( buf );
+                const char * pkg = PACKAGE_DATA_DIR;
+                const char * xdg = getenv( "XDG_DATA_DIRS" );
+                const char * fallback = "/usr/local/share:/usr/share";
+                char * buf = tr_strdup_printf( "%s:%s:%s", (pkg?pkg:""), (xdg?xdg:""), fallback );
+                tmp = buf;
                 while( tmp && *tmp ) {
                     const char * end = strchr( tmp, ':' );
                     if( end ) {
-                        tr_list_append( &candidates, tr_strndup( tmp, end - tmp ) );
+                        if( ( end - tmp ) > 1 )
+                            tr_list_append( &candidates, tr_strndup( tmp, end - tmp ) );
                         tmp = end + 1;
                     } else if( tmp && *tmp ) {
@@ -573 +570 @@
                     }
                 }
-                evbuffer_free( buf );
+                tr_free( buf );
             }