make tr_info.webseedCount and tr_info.trackerCount unsigned.

diff --git a/gtk/details.c b/gtk/details.c
index 005b41e48bb93fbacb4ace8a9d92d402b2a44ef7..cede45e2c3b9641de925f411ecace13b46c900ed 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -1351,7 +1351,7 @@ refreshWebseedList (struct DetailsImpl * di, tr_torrent ** torrents, int n)
 
     /* step 2: add any new webseeds */
     for (i=0; i<n; ++i) {
-        int j;
+        unsigned int j;
         const tr_torrent * tor = torrents[i];
         const tr_info * inf = tr_torrentInfo (tor);
         total += inf->webseedCount;
@@ -1375,7 +1375,7 @@ refreshWebseedList (struct DetailsImpl * di, tr_torrent ** torrents, int n)
 
     /* step 3: update the webseeds */
     for (i=0; i<n; ++i) {
-        int j;
+        unsigned int j;
         tr_torrent * tor = torrents[i];
         const tr_info * inf = tr_torrentInfo (tor);
         double * speeds_KBps = tr_torrentWebSpeeds_KBps (tor);
@@ -2159,7 +2159,7 @@ on_edit_trackers_response (GtkDialog * dialog, int response, gpointer data)
 static void
 get_editable_tracker_list (GString * gstr, const tr_torrent * tor)
 {
-    int i;
+    unsigned int i;
     int tier = 0;
     const tr_info * inf = tr_torrentInfo (tor);
     for (i=0; i<inf->trackerCount; ++i) {

diff --git a/gtk/filter.c b/gtk/filter.c
index 26e1b583c98f4edcd0ba8dc6981b966fe6cc7964..f74ad023c107cff46ccb7091c24c91d3c88f774e 100644 (file)
--- a/gtk/filter.c
+++ b/gtk/filter.c
@@ -552,7 +552,7 @@ test_category (tr_torrent * tor, int active_category_type, const char * host)
             return tr_torrentGetPriority (tor) == TR_PRI_LOW;
 
         case CAT_FILTER_TYPE_HOST: {
-            int i;
+            unsigned int i;
             char tmp[1024];
             for (i=0; i<inf->trackerCount; ++i) {
                 gtr_get_host_from_url (tmp, sizeof (tmp), inf->trackers[i].announce);

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index 2aa1d9a6eb1812a70e181a23465b973848025ee7..e0b9457978d06aa8a24abe6dc9dde167fc4666a6 100644 (file)
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -1011,7 +1011,7 @@ on_torrent_metadata_changed (tr_torrent * tor, void * gcore)
 static unsigned int
 build_torrent_trackers_hash (tr_torrent * tor)
 {
-  int i;
+  unsigned int i;
   const char * pch;
   uint64_t hash = 0;
   const tr_info * const inf = tr_torrentInfo (tor);

diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
index afe95ef68bcbaf043d0484999c6d369a2aa53839..03fe835452bc740607cebf8b273e188bd694b563 100644 (file)
--- a/libtransmission/metainfo.c
+++ b/libtransmission/metainfo.c
@@ -545,7 +545,7 @@ tr_metainfoParse (const tr_session * session,
 void
 tr_metainfoFree (tr_info * inf)
 {
-  int i;
+  unsigned int i;
   tr_file_index_t ff;
 
   for (i=0; i<inf->webseedCount; i++)

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 236e545731432ad8fb6b7cd09905b2a07ca8f51f..fc462d929992d3dc2f9ee25c69e1c5b830819801 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -513,7 +513,7 @@ static void peerCallbackFunc (tr_peer *, const tr_peer_event *, void *);
 static void
 rebuildWebseedArray (Torrent * t, tr_torrent * tor)
 {
-    int i;
+    unsigned int i;
     const tr_info * inf = &tor->info;
 
     /* clear the array */
@@ -2688,8 +2688,8 @@ tr_peerMgrTorrentStats (tr_torrent  * tor,
 double*
 tr_peerMgrWebSpeeds_KBps (const tr_torrent * tor)
 {
-  int i;
-  int webseedCount;
+  unsigned int i;
+  unsigned int webseedCount;
   const Torrent * t;
   const tr_webseed ** webseeds;
   double * ret = NULL;

diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c
index e6cf2d722103a2480f34741fc7eabcfd79dd43f9..6a581dd5992fd5568438cb2dbc81d9bf617328b1 100644 (file)
--- a/libtransmission/rpcimpl.c
+++ b/libtransmission/rpcimpl.c
@@ -446,29 +446,29 @@ addFiles (const tr_torrent * tor,
 }
 
 static void
-addWebseeds (const tr_info * info,
-             tr_variant *       webseeds)
+addWebseeds (const tr_info  * info,
+             tr_variant     * webseeds)
 {
-    int i;
+  unsigned int i;
 
-    for (i = 0; i < info->webseedCount; ++i)
-        tr_variantListAddStr (webseeds, info->webseeds[i]);
+  for (i=0; i< info->webseedCount; ++i)
+    tr_variantListAddStr (webseeds, info->webseeds[i]);
 }
 
 static void
-addTrackers (const tr_info * info,
-             tr_variant *       trackers)
+addTrackers (const tr_info  * info,
+             tr_variant     * trackers)
 {
-    int i;
+  unsigned int i;
 
-    for (i = 0; i < info->trackerCount; ++i)
+  for (i=0; i<info->trackerCount; ++i)
     {
-        const tr_tracker_info * t = &info->trackers[i];
-        tr_variant *               d = tr_variantListAddDict (trackers, 4);
-        tr_variantDictAddStr (d, TR_KEY_announce, t->announce);
-        tr_variantDictAddInt (d, TR_KEY_id, t->id);
-        tr_variantDictAddStr (d, TR_KEY_scrape, t->scrape);
-        tr_variantDictAddInt (d, TR_KEY_tier, t->tier);
+      const tr_tracker_info * t = &info->trackers[i];
+      tr_variant * d = tr_variantListAddDict (trackers, 4);
+      tr_variantDictAddStr (d, TR_KEY_announce, t->announce);
+      tr_variantDictAddInt (d, TR_KEY_id, t->id);
+      tr_variantDictAddStr (d, TR_KEY_scrape, t->scrape);
+      tr_variantDictAddInt (d, TR_KEY_tier, t->tier);
     }
 }
 

diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
index 0e218535367b4b92a6f36ef5f69959c80b4a3893..d0d41fd1b1e460ff34348767c4765d800ddee6e8 100644 (file)
--- a/libtransmission/torrent-magnet.c
+++ b/libtransmission/torrent-magnet.c
@@ -373,7 +373,7 @@ tr_torrentGetMetadataPercent (const tr_torrent * tor)
 char*
 tr_torrentInfoGetMagnetLink (const tr_info * inf)
 {
-    int i;
+    unsigned int i;
     const char * name;
     struct evbuffer * s = evbuffer_new ();
 

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 364c42388992ec013d45f4b168ad63f98d227294..caf64fb4927ace84186820476ef96fdbdc85319e 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -1256,7 +1256,7 @@ tr_torrentStat (tr_torrent * tor)
             tor->etaDLSpeedCalculatedAt = now;
           }
 
-        if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 0))
+        if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 1))
           s->eta = TR_ETA_NOT_AVAIL;
         else if (tor->etaDLSpeed_KBps < 1)
           s->eta = TR_ETA_UNKNOWN;

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index d2f4ede4f331115eca5c673de3b262dfd0c4489f..08a820873464d85e8a9c2b915a615297923d1de4 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -1724,8 +1724,8 @@ struct tr_info
     /* Torrent info */
     time_t             dateCreated;
 
-    int                trackerCount;
-    int                webseedCount;
+    unsigned int       trackerCount;
+    unsigned int       webseedCount;
     tr_file_index_t    fileCount;
     uint32_t           pieceSize;
     tr_piece_index_t   pieceCount;

diff --git a/qt/app.cc b/qt/app.cc
index a9ffd6c0b4b4c21b073c3ccdd04bd84e734008f4..8d4689177cbccf5f9aac88d3c99cc6b368dfee14 100644 (file)
--- a/qt/app.cc
+++ b/qt/app.cc
@@ -469,6 +469,16 @@ MyApp :: notify( const QString& title, const QString& body ) const
 int
 main( int argc, char * argv[] )
 {
+std::cerr << "sizeof double " << sizeof(double) << std::endl;
+std::cerr << "sizeof Speed " << sizeof(Speed) << std::endl;
+std::cerr << "sizeof int " << sizeof(int) << std::endl;
+std::cerr << "sizeof bool " << sizeof(bool) << std::endl;
+std::cerr << "sizeof uint64_t " << sizeof(uint64_t) << std::endl;
+std::cerr << "sizeof QString is " << sizeof(QString) << std::endl;
+std::cerr << "sizeof TrFile is " << sizeof(struct TrFile) << std::endl;
+std::cerr << "sizeof Peer is " << sizeof(Peer) << std::endl;
+std::cerr << "sizeof TrackerStat is " << sizeof(TrackerStat) << std::endl;
+
     // find .torrents, URLs, magnet links, etc in the command-line args
     int c;
     QStringList addme;

diff --git a/qt/my-valgrind.sh b/qt/my-valgrind.sh
index 916b59450a77061454ea6d28c56580172ebf6e15..581bb7fe01dae78d65b9b6f89130253df025e722 100755 (executable)
--- a/qt/my-valgrind.sh
+++ b/qt/my-valgrind.sh
@@ -1,3 +1,4 @@
 #/bin/sh
-valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
+#valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
+valgrind --tool=massif --threshold=0.2 ./transmission-qt 2>&1 | tee runlog
 #valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=no ./transmission-qt 2>&1 | tee runlog

diff --git a/qt/torrent.cc b/qt/torrent.cc
index e40d6148a3b4d56d71b7a79916c8f5cc87069bdc..703f8932ab1e20635341c890d774297556bc028d 100644 (file)
--- a/qt/torrent.cc
+++ b/qt/torrent.cc
@@ -555,6 +555,7 @@ Torrent :: update (tr_variant * d)
       tr_variant * child;
 
       myFiles.clear ();
+      myFiles.reserve (tr_variantListSize (files));
 
       while ((child = tr_variantListChild (files, i)))
         {

diff --git a/utils/show.c b/utils/show.c
index 4c54cce67323777e030a02710ce17bfc46c82ec6..6433aa5de42072acf8a875bf0dddc104ecaf3a29 100644 (file)
--- a/utils/show.c
+++ b/utils/show.c
@@ -122,7 +122,7 @@ compare_files_by_name (const void * va, const void * vb)
 static void
 showInfo (const tr_info * inf)
 {
-  int i;
+  unsigned int i;
   char buf[128];
   tr_file ** files;
   int prevTier = -1;
@@ -185,10 +185,10 @@ showInfo (const tr_info * inf)
 
   printf ("\nFILES\n\n");
   files = tr_new (tr_file*, inf->fileCount);
-  for (i=0; i< (int)inf->fileCount; ++i)
+  for (i=0; i<inf->fileCount; ++i)
     files[i] = &inf->files[i];
   qsort (files, inf->fileCount, sizeof (tr_file*), compare_files_by_name);
-  for (i=0; i< (int)inf->fileCount; ++i)
+  for (i=0; i<inf->fileCount; ++i)
     printf ("  %s (%s)\n", files[i]->name, tr_formatter_size_B (buf, files[i]->length, sizeof (buf)));
   tr_free (files);
 }
@@ -217,7 +217,7 @@ tr_curl_easy_init (struct evbuffer * writebuf)
 static void
 doScrape (const tr_info * inf)
 {
-  int i;
+  unsigned int i;
 
   for (i=0; i<inf->trackerCount; ++i)
     {