Changeset 14130 for trunk/libtransmission/torrent.c

Timestamp:

Jul 20, 2013, 3:37:13 PM (9 years ago)

Author:

jordan

Message:

add tr_sessionGetTorrents(), a private utility to avoid code duplication in libtransmission

File:

• trunk/libtransmission/torrent.c (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -3391 +3391 @@
 queueIsSequenced (tr_session * session)
 {
-  int i ;
-  int n ;
-  bool is_sequenced = true;
+  int i;
+  int n;
+  bool is_sequenced;
   tr_torrent * tor;
-  tr_torrent ** tmp = tr_new (tr_torrent *, session->torrentCount);
-
-  /* get all the torrents */
+  tr_torrent ** torrents;
+
   n = 0;
-  tor = NULL;
-  while ((tor = tr_torrentNext (session, tor)))
-    tmp[n++] = tor;
-
-  /* sort them by position */
-  qsort (tmp, n, sizeof (tr_torrent *), compareTorrentByQueuePosition);
+  torrents = tr_sessionGetTorrents (session, &n);
+  qsort (torrents, n, sizeof (tr_torrent *), compareTorrentByQueuePosition);
 
 #if 0
@@ -3414 +3409 @@
 
   /* test them */
+  is_sequenced = true;
   for (i=0; is_sequenced && i<n; ++i)
-    if (tmp[i]->queuePosition != i)
+    if (torrents[i]->queuePosition != i)
       is_sequenced = false;
 
-  tr_free (tmp);
+  tr_free (torrents);
   return is_sequenced;
 }