/[graveman]/graveman/current/src/tools.c
ViewVC logotype

Diff of /graveman/current/src/tools.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by scresto, Tue Feb 1 02:35:19 2005 UTC revision 1.6 by scresto, Sat Feb 5 17:31:48 2005 UTC
# Line 121  gshort make_short(gchar *Abuf) Line 121  gshort make_short(gchar *Abuf)
121  }  }
122    
123  /* format un nombre en chaine de la forme MM:SS */  /* format un nombre en chaine de la forme MM:SS */
124  gchar *format_length(guint32 Alennbr)  gchar *format_length(guint64 Alennbr)
125  {  {
126     guint Lmin = 0, Lsec = 0;     guint Lmin = 0, Lsec = 0;
127    
# Line 132  gchar *format_length(guint32 Alennbr) Line 132  gchar *format_length(guint32 Alennbr)
132  }  }
133    
134  /* format un nombre en taille de la forme XX Mo ou XX Ko oo XX octets */  /* format un nombre en taille de la forme XX Mo ou XX Ko oo XX octets */
135  gchar *format_size(guint32 Asize)  gchar *format_size(guint64 Asize)
136  {  {
137    guint32 Lko = Asize / 1024;    guint64 Lko = Asize / 1024;
138    gdouble Lreste;    gdouble Lreste;
139    guint32 Lmo;    guint64 Lmo;
140    
141    if (Lko < 1) return g_strdup_printf("%d %s", Asize, Asize > 1 ? _("octets") : _("octet"));    if (Lko < 1) return g_strdup_printf("%lld %s", (unsigned long long) Asize, Asize > 1 ? _("octets") : _("MB"));
142    Lmo = Lko / 1024;    Lmo = Lko / 1024;
143    
144    if (Lmo < 1) {    if (Lmo < 1) {
145      if (Asize - (Lko * 1024) > 511) Lko++;      if (Asize - (Lko * 1024) > 511) Lko++;
146      return g_strdup_printf(_("%d K"), Lko);      return g_strdup_printf(_("%lld K"), (unsigned long long) Lko);
147    }    }
148    
149    Lreste = (Lko - (Lmo * 1024));    Lreste = (Lko - (Lmo * 1024));
150    Lreste = Lreste / 1024;    Lreste = Lreste / 1024;
151    if (Lreste > 0 && Lreste < 1) {    if (Lreste > 0 && Lreste < 1) {
152      return g_strdup_printf(_("%d.%.0f MB"), Lmo, Lreste * 10);      return g_strdup_printf(_("%lld.%.0f MB"), (unsigned long long) Lmo, Lreste * 10);
153    } else {    } else {
154      return g_strdup_printf(_("%d MB"), Lmo);      return g_strdup_printf(_("%lld MB"), (unsigned long long) Lmo);
155    }    }
156  }  }
157    

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26