Changeset 2360

Timestamp:

Jul 15, 2007, 7:12:54 PM (16 years ago)

Author:

charles

Message:

make tr_torrentStat() const.
malloc, rather than calloc, the buffer in strndup.

Location:

trunk

Files:

• cli/transmissioncli.c (modified) (1 diff)
• daemon/torrents.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/utils.c (modified) (1 diff)

trunk/cli/transmissioncli.c

@@ -101 +101 @@
     int i, error;
     tr_handle_t  * h;
-    tr_stat_t    * s;
+    const tr_stat_t    * s;
     tr_handle_status_t * hstat;
 

trunk/daemon/torrents.c

@@ -178 +178 @@
 {
     struct tor * tor;
-    tr_stat_t  * st;
 
     assert( NULL != gl_handle );
@@ -184 +183 @@
 
     tor = idlookup( id );
-    if( NULL == tor )
-    {
-        return;
-    }
-
-    st = tr_torrentStat( tor->tor );
-    if( TR_STATUS_INACTIVE & st->status )
-    {
-        tr_torrentStart( tor->tor );
+    if( tor != NULL )
+    {
+        const tr_stat_t  * st = tr_torrentStat( tor->tor );
+
+        if( TR_STATUS_INACTIVE & st->status )
+        {
+            tr_torrentStart( tor->tor );
+            savestate();
+        }
+    }
+
+}
+
+void
+torrent_stop( int id )
+{
+    struct tor * tor;
+
+    assert( NULL != gl_handle );
+    assert( !gl_exiting );
+
+    tor = idlookup( id );
+    if( tor != NULL )
+    {
+        const tr_stat_t  * st = tr_torrentStat( tor->tor );
+
+        if( TR_STATUS_ACTIVE & st->status )
+        {
+            tr_torrentStop( tor->tor );
+            savestate();
+        }
+    }
+}
+
+void
+torrent_remove( int id )
+{
+    struct tor * tor;
+
+    assert( NULL != gl_handle );
+    assert( !gl_exiting );
+
+    tor = idlookup( id );
+    if( tor != NULL )
+    {
+        closetor( tor, 1 );
         savestate();
     }
-}
-
-void
-torrent_stop( int id )
-{
-    struct tor * tor;
-    tr_stat_t  * st;
-
-    assert( NULL != gl_handle );
-    assert( !gl_exiting );
-
-    tor = idlookup( id );
-    if( NULL == tor )
-    {
-        return;
-    }
-
-    st = tr_torrentStat( tor->tor );
-    if( TR_STATUS_ACTIVE & st->status )
-    {
-        tr_torrentStop( tor->tor );
-        savestate();
-    }
-}
-
-void
-torrent_remove( int id )
-{
-    struct tor * tor;
-
-    assert( NULL != gl_handle );
-    assert( !gl_exiting );
-
-    tor = idlookup( id );
-    if( NULL == tor )
-    {
-        return;
-    }
-
-    closetor( tor, 1 );
-    savestate();
 }
 

trunk/libtransmission/torrent.c

@@ -529 +529 @@
 }
 
-tr_stat_t * tr_torrentStat( tr_torrent_t * tor )
+const tr_stat_t *
+tr_torrentStat( tr_torrent_t * tor )
 {
     tr_stat_t * s;

trunk/libtransmission/transmission.h

@@ -426 +426 @@
  **********************************************************************/
 typedef struct tr_stat_s tr_stat_t;
-tr_stat_t * tr_torrentStat( tr_torrent_t * );
+const tr_stat_t * tr_torrentStat( tr_torrent_t * );
 
 /***********************************************************************

trunk/libtransmission/utils.c

@@ -400 +400 @@
 {
     char * out = NULL;
+
     if( in != NULL )
     {
-        out = tr_calloc( len+1, 1 );
+        out = tr_malloc( len+1 );
         memcpy( out, in, len );
+        out[len] = '\0';
     }
     return out;