Changeset 2245

Timestamp:

Jun 30, 2007, 1:36:58 PM (15 years ago)

Author:

charles

Message:

make tr_torrentInfo() a const function

Location:

trunk

Files:

• cli/transmissioncli.c (modified) (1 diff)
• daemon/server.c (modified) (8 diffs)
• daemon/torrents.c (modified) (5 diffs)
• daemon/torrents.h (modified) (1 diff)
• gtk/ipc.c (modified) (2 diffs)
• gtk/torrent-inspector.c (modified) (1 diff)
• gtk/tr_core.c (modified) (1 diff)
• gtk/tr_torrent.c (modified) (2 diffs)
• gtk/tr_torrent.h (modified) (1 diff)
• libtransmission/ipcparse.c (modified) (1 diff)
• libtransmission/ipcparse.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)

trunk/cli/transmissioncli.c

@@ -164 +164 @@
     if( showInfo )
     {
-        tr_info_t * info = tr_torrentInfo( tor );
+        const tr_info_t * info = tr_torrentInfo( tor );
 
         s = tr_torrentStat( tor );

trunk/daemon/server.c

@@ -444 +444 @@
     size_t          buflen;
     uint8_t       * buf;
-    tr_info_t     * inf;
 
     if( NULL == val || TYPE_LIST != val->type )
@@ -471 +470 @@
         if( TORRENT_ID_VALID( tor ) )
         {
-            inf = torrent_info( tor );
+            const tr_info_t * inf = torrent_info( tor );
             if( 0 > ipc_addinfo( added, tor, inf, 0 ) )
             {
@@ -497 +496 @@
     uint8_t       * buf;
     const char    * dir;
-    tr_info_t     * inf;
 
     if( NULL == dict || TYPE_DICT != dict->type )
@@ -531 +529 @@
     if( TORRENT_ID_VALID( tor ) )
     {
+        const tr_info_t * inf;
         val = ipc_initval( client->ipc, IPC_MSG_INFO, tag, &pk, TYPE_LIST );
         if( NULL == val )
@@ -750 +749 @@
 addinfo( benc_val_t * list, int id, int types )
 {
-    tr_info_t * inf;
-
-    inf = torrent_info( id );
-    if( NULL == inf )
-    {
-        return 0;
-    }
-
-    return ipc_addinfo( list, id, inf, types );
+    const tr_info_t * inf = torrent_info( id );
+    return inf ? ipc_addinfo( list, id, inf, types ) : 0;
 }
 
@@ -764 +756 @@
 addstat( benc_val_t * list, int id, int types )
 {
-    tr_stat_t * st;
-
-    st = torrent_stat( id );
-    if( NULL == st )
-    {
-        return 0;
-    }
-
-    return ipc_addstat( list, id, st, types );
+    const tr_stat_t * st = torrent_stat( id );
+    return st ? ipc_addstat( list, id, st, types ) : 0;
 }
 
@@ -850 +835 @@
     benc_val_t    * hash, pk, * pkinf;
     int64_t         found;
-    tr_info_t     * inf;
 
     if( NULL == val || TYPE_LIST != val->type )
@@ -868 +852 @@
     for( ii = 0; val->val.l.count > ii; ii++ )
     {
+        const tr_info_t * inf;
         hash = &val->val.l.vals[ii];
         if( NULL == hash || TYPE_STR != hash->type ||

trunk/daemon/torrents.c

@@ -238 +238 @@
 }
 
-tr_info_t *
+const tr_info_t *
 torrent_info( int id )
 {
@@ -255 +255 @@
 }
 
-tr_stat_t *
+const tr_stat_t *
 torrent_stat( int id )
 {
@@ -476 +476 @@
     struct tor * tor, * found;
     int          errcode;
-    tr_info_t  * inf;
+    const tr_info_t  * inf;
 
     assert( ( NULL != path && NULL == hash && NULL == data ) ||
@@ -793 +793 @@
     benc_val_t   top, * list, * tor;
     struct tor * ii;
-    tr_info_t  * inf;
-    tr_stat_t  * st;
     uint8_t    * buf;
     int          len, pexset;
@@ -829 +827 @@
     RB_FOREACH( ii, tortree, &gl_tree )
     {
+        const tr_info_t * inf;
+        const tr_stat_t * st;
         tor = tr_bencListAdd( list );
         assert( NULL != tor );

trunk/daemon/torrents.h

@@ -39 +39 @@
 void         torrent_stop                ( int );
 void         torrent_remove              ( int );
-tr_info_t  * torrent_info                ( int );
-tr_stat_t  * torrent_stat                ( int );
+const tr_info_t  * torrent_info          ( int );
+const tr_stat_t  * torrent_stat          ( int );
 int          torrent_lookup              ( const uint8_t * );
 void       * torrent_iter                ( void *, int * );

trunk/gtk/ipc.c

@@ -808 +808 @@
     if( IPC_MSG_INFO == msgid )
     {
-        tr_info_t * inf = tr_torrent_info( tor );
+        const tr_info_t * inf = tr_torrent_info( tor );
         return ipc_addinfo( val, torid, inf, types );
     }
@@ -827 +827 @@
     int                    ii, torid;
     TrTorrent            * tor;
-    tr_info_t            * inf;
+    const tr_info_t      * inf;
     uint8_t              * buf;
     size_t                 size;

trunk/gtk/torrent-inspector.c

@@ -1257 +1257 @@
     GtkWidget           * ret;
     FileData            * data;
-    tr_info_t           * inf;
+    const tr_info_t     * inf;
     tr_torrent_t        * tor;
     GtkTreeStore        * store;

trunk/gtk/tr_core.c

@@ -570 +570 @@
 {
     GtkTreeIter iter;
-    tr_info_t * inf;
+    const tr_info_t * inf;
 
     gtk_list_store_append( GTK_LIST_STORE( self->model ), &iter );

trunk/gtk/tr_torrent.c

@@ -257 +257 @@
 }
 
-tr_info_t *
+const tr_info_t *
 tr_torrent_info(TrTorrent *tor) {
   TR_IS_TORRENT(tor);
@@ -465 +465 @@
 tr_torrent_get_state( TrTorrent * tor, benc_val_t * state )
 {
-    tr_info_t  * inf;
+    const tr_info_t  * inf;
 
     TR_IS_TORRENT( tor );

trunk/gtk/tr_torrent.h

@@ -86 +86 @@
 tr_torrent_stat(TrTorrent *tor);
 
-tr_info_t *
+const tr_info_t *
 tr_torrent_info(TrTorrent *tor);
 

trunk/libtransmission/ipcparse.c

@@ -585 +585 @@
 
 int
-ipc_addinfo( benc_val_t * list, int tor, tr_info_t * inf, int types )
+ipc_addinfo( benc_val_t * list, int tor, const tr_info_t * inf, int types )
 {
     benc_val_t * dict, * item, * file, * tier;

trunk/libtransmission/ipcparse.h

@@ -159 +159 @@
 uint8_t *    ipc_mkgetinfo( struct ipc_info *, size_t *, enum ipc_msg, int64_t,
                             int, const int * );
-int          ipc_addinfo  ( benc_val_t *, int, tr_info_t *, int );
+int          ipc_addinfo  ( benc_val_t *, int, const tr_info_t *, int );
 int          ipc_addstat  ( benc_val_t *, int, const tr_stat_t *, int );
 

trunk/libtransmission/torrent.c

@@ -416 +416 @@
 }
 
-tr_info_t * tr_torrentInfo( tr_torrent_t * tor )
+const tr_info_t *
+tr_torrentInfo( const tr_torrent_t * tor )
 {
     return &tor->info;

trunk/libtransmission/transmission.h

@@ -340 +340 @@
  * Return torrent metainfo.
  **********************************************************************/
-tr_info_t * tr_torrentInfo( tr_torrent_t * );
+const tr_info_t * tr_torrentInfo( const tr_torrent_t * );
 
 /***********************************************************************