diff options
| author | TotalCaesar659 <x24cm5b8c54q6szxw@yandex.ru> | 2017-04-11 02:24:46 +0300 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2017-04-10 18:04:29 -0700 |
| commit | 6c4401dd00a2ed4cb2c6373f5e7906fa8cebc352 (patch) | |
| tree | 40493b24f76b7c713350424034e84dc81368a043 | |
| parent | 74d5a417ba2e483deb7a0c387706a613549d32c4 (diff) | |
Fixed compile warning in utils.c
Fixed compile warning in utils.c:
[ 37%] Building C object CMakeFiles/hardinfo.dir/hardinfo/util.c.o
/home/maxpayne/hardinfo/hardinfo/util.c: In function ‘seconds_to_string’:
/home/maxpayne/hardinfo/hardinfo/util.c:105:34: warning: too many arguments for format [-Wformat-extra-args]
return g_strdup_printf(ngettext("%d hour, ", "%d hours, ", hours), hours,
^
/home/maxpayne/hardinfo/hardinfo/util.c:108:37: warning: too many arguments for format [-Wformat-extra-args]
return g_strdup_printf(ngettext("%d day, ", "%d days, ", days), days,
^
[ 39%] Linking C executable hardinfo
| -rw-r--r-- | hardinfo/util.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hardinfo/util.c b/hardinfo/util.c index 49def403..a2e69073 100644 --- a/hardinfo/util.c +++ b/hardinfo/util.c @@ -97,17 +97,20 @@ gchar *seconds_to_string(unsigned int seconds) minutes %= 60; days = hours / 24; hours %= 24; + + gchar *wminutes; + gchar *whours; + gchar *wdays; + wdays = ngettext("%d day, ", "%d days, ", days); + whours = ngettext("%d hour, ", "%d hours, ", hours); + wminutes = ngettext("%d minute", "%d minutes", minutes); if (days < 1) { if (hours < 1) return g_strdup_printf(ngettext("%d minute", "%d minutes", minutes), minutes); - - return g_strdup_printf(ngettext("%d hour, ", "%d hours, ", hours), hours, - ngettext("%d minute", "%d minutes", minutes), minutes); + return g_strdup_printf(whours, wminutes); } - return g_strdup_printf(ngettext("%d day, ", "%d days, ", days), days, - ngettext("%d hour and ", "%d hours and ", hours), hours, - ngettext("%d minute", "%d minutes", minutes), minutes); + return g_strdup_printf(wdays, whours, wminutes); } inline gchar *size_human_readable(gfloat size) |