Changeset 7543

Timestamp:

Dec 30, 2008, 3:29:09 AM (12 years ago)

Author:

charles

Message:

(trunk libT) eliminate a couple more unnecessary malloc() + free() pairs

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (4 diffs)
• inout.c (modified) (2 diffs)
• platform.h (modified) (1 diff)
• utils.c (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -262 +262 @@
                    uint64_t     desiredFileSize )
 {
-    int                  i, winner = -1;
+    int i, winner = -1;
     struct tr_openfile * o;
-    char               * filename;
+    char filename[MAX_PATH_LENGTH];
 
     assert( folder && *folder );
@@ -270 +270 @@
     assert( doWrite == 0 || doWrite == 1 );
 
-    filename = tr_buildPath( folder, torrentFile, NULL );
-    dbgmsg( "looking for file '%s', writable %c", filename,
-            doWrite ? 'y' : 'n' );
+    tr_snprintf( filename, sizeof( filename ), "%s%c%s", folder, TR_PATH_DELIMITER, torrentFile );
+    dbgmsg( "looking for file '%s', writable %c", filename, doWrite ? 'y' : 'n' );
 
     tr_lockLock( gFd->lock );
@@ -362 +361 @@
         if( err ) {
             tr_lockUnlock( gFd->lock );
-            tr_free( filename );
             errno = err;
             return -1;
@@ -377 +375 @@
     o->closeWhenDone = 0;
     o->date = tr_date( );
-    tr_free( filename );
     tr_lockUnlock( gFd->lock );
     return o->fd;

trunk/libtransmission/inout.c

@@ -74 +74 @@
 
     typedef size_t ( *iofunc )( int, void *, size_t );
-    iofunc          func = ioMode ==
-                           TR_IO_READ ? (iofunc)read : (iofunc)write;
-    char          * path;
+    iofunc          func = ioMode == TR_IO_READ ? (iofunc)read : (iofunc)write;
     struct stat     sb;
     int             fd = -1;
@@ -87 +85 @@
     assert( fileOffset + buflen <= file->length );
 
-    path = tr_buildPath( tor->downloadDir, file->name, NULL );
-    fileExists = !stat( path, &sb );
-    tr_free( path );
+    {
+        char path[MAX_PATH_LENGTH];
+        tr_snprintf( path, sizeof( path ), "%s%c%s", tor->downloadDir, TR_PATH_DELIMITER, file->name );
+        fileExists = !stat( path, &sb );
+    }
 
     if( !file->length )

trunk/libtransmission/platform.h

@@ -37 +37 @@
  #define MAX_PATH_LENGTH  MAX_PATH
 #else
- #define MAX_PATH_LENGTH  1024
+ #define MAX_PATH_LENGTH  2048
 #endif
 

trunk/libtransmission/utils.c

@@ -679 +679 @@
 
 char*
-tr_strdup_printf( const char * fmt,
-                  ... )
+tr_strdup_printf( const char * fmt, ... )
 {
     char *            ret = NULL;