Changeset 5220 for trunk/gtk/util.c

Timestamp:

Mar 7, 2008, 7:27:46 PM (14 years ago)

Author:

charles

Message:

(gtk) r5212 tr_strltime() cleanup

File:

• trunk/gtk/util.c (modified) (4 diffs)

trunk/gtk/util.c

@@ -70 +70 @@
 tr_strlsize( char * buf, guint64 size, size_t buflen )
 {
+    if( !size )
+        g_strlcpy( buf, _( "None" ), buflen );
 #if GLIB_CHECK_VERSION(2,16,0)
-    char * tmp = g_format_size_for_display( s );
-    g_strlcpy( buf, tmp, buflen );
-    g_free( tmp );
+    else{ 
+        char * tmp = g_format_size_for_display( s );
+        g_strlcpy( buf, tmp, buflen );
+        g_free( tmp );
+    }
 #else
-    if( size < (guint64)KILOBYTE_FACTOR )
+    else if( size < (guint64)KILOBYTE_FACTOR )
         g_snprintf( buf, buflen, ngettext("%u byte", "%u bytes", (guint)size), (guint)size );
     else {
@@ -121 +125 @@
     if( seconds < 60 )
     {
-        g_snprintf( buf, sizeof( buf ), ngettext( "%'d second", "%'d seconds", (int)seconds ), (int) seconds );
+        g_snprintf( buf, buflen, ngettext( "%'d second", "%'d seconds", (int)seconds ), (int) seconds );
         return buf;
     }
@@ -128 +132 @@
     {
         const int minutes = ( seconds + 30 ) / 60;
-        g_snprintf( buf, sizeof( buf ), ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
+        g_snprintf( buf, buflen, ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
         return buf;
     }
@@ -147 +151 @@
     }
 
-    g_snprintf( buf, sizeof( buf ), ngettext( "%'d hour", "%'d hours", hours ), hours );
+    g_snprintf( buf, buflen, ngettext( "%'d hour", "%'d hours", hours ), hours );
     return buf;
 }