Changeset 4338

Timestamp:

Dec 26, 2007, 6:38:33 AM (14 years ago)

Author:

charles

Message:

(gtk) fix wrong units in the s stats dialog. plug small memory leak.

Location:

trunk/gtk

Files:

• stats.c (modified) (1 diff)
• tr_torrent.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/stats.c

@@ -60 +60 @@
     setLabel( ui->one_up_lb, tr_strlsize( buf, one.uploadedBytes, sizeof(buf) ) );
     setLabel( ui->one_down_lb, tr_strlsize( buf, one.downloadedBytes, sizeof(buf) ) );
-    setLabel( ui->one_time_lb, tr_strlsize( buf, one.secondsActive, sizeof(buf) ) );
+    setLabel( ui->one_time_lb, tr_strltime( buf, one.secondsActive, sizeof(buf) ) );
     setLabelFromRatio( ui->one_ratio_lb, one.ratio );
     setLabel( ui->all_sessions_lb, g_strdup_printf( _("Started %d times"), (int)all.sessionCount ) );
     setLabel( ui->all_up_lb, tr_strlsize( buf, all.uploadedBytes, sizeof(buf) ) );
     setLabel( ui->all_down_lb, tr_strlsize( buf, all.downloadedBytes, sizeof(buf) ) );
-    setLabel( ui->all_time_lb, readabletime( all.secondsActive ) );
+    setLabel( ui->all_time_lb, tr_strltime( buf, all.secondsActive, sizeof(buf) ) );
     setLabelFromRatio( ui->all_ratio_lb, all.ratio );
 

trunk/gtk/tr_torrent.c

@@ -310 +310 @@
                 top = g_strdup_printf( _("Stalled (%.1f%%)"), prog );
             else {
-                char * timestr = readabletime(eta);
+                char timestr[128];
+                tr_strltime( timestr, eta, sizeof( timestr ) );
                 top = g_strdup_printf( _("%s remaining (%.1f%%)"), timestr, prog );
-                g_free(timestr);
             }
             break;

trunk/gtk/util.c

@@ -92 +92 @@
 #define DAYS(s)                 ((s) / 60 / 60 / 24 % 7)
 
-char *
-readabletime(int secs) {
-  if(60 > secs)
-    return g_strdup_printf(_("%i %s"),
-      SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
-  else if(60 * 60 > secs)
-    return g_strdup_printf(_("%i %s %i %s"),
-      MINUTES(secs), ngettext("min", "mins", MINUTES(secs)),
-      SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
-  else if(60 * 60 * 24 > secs)
-    return g_strdup_printf(_("%i %s %i %s"),
-      HOURS(secs),   ngettext("hr", "hrs", HOURS(secs)),
-      MINUTES(secs), ngettext("min", "mins", MINUTES(secs)));
-  else
-    return g_strdup_printf(_("%i %s %i %s"),
-      DAYS(secs),    ngettext("day", "days", DAYS(secs)),
-      HOURS(secs),   ngettext("hr", "hrs", HOURS(secs)));
+char*
+tr_strltime( char * buf, int secs, size_t buflen )
+{
+    if( secs < 60 )
+    {
+        g_snprintf( buf, buflen, _( "%i %s" ),
+                    SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
+    }
+    else if( secs < 60*60 )
+    {
+        g_snprintf( buf, buflen, _("%i %s %i %s"),
+                    MINUTES(secs), ngettext("min", "mins", MINUTES(secs)),
+                    SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
+    }
+    else if( secs < 60*60*24 )
+    {
+        g_snprintf( buf, buflen, _("%i %s %i %s"),
+                    HOURS(secs),   ngettext("hr", "hrs", HOURS(secs)),
+                    MINUTES(secs), ngettext("min", "mins", MINUTES(secs)));
+    }
+    else
+    {
+        g_snprintf( buf, buflen, _("%i %s %i %s"),
+                    DAYS(secs),  ngettext("day", "days", DAYS(secs)),
+                    HOURS(secs), ngettext("hr", "hrs", HOURS(secs)));
+    }
+
+    return buf;
 }
 

trunk/gtk/util.h

@@ -51 +51 @@
 char* tr_strlspeed (char * buf, double KiBps, size_t buflen );
 
-/* return a human-readable string for the time given in seconds.
-   the string must be g_free()d */
-char *
-readabletime(int secs);
+/* return a human-readable string for the time given in seconds. */
+char* tr_strltime( char * buf, int secs, size_t buflen );
 
 char *