osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Nathan Hartwell via bug 2733: 

Added time_secs_to_str_unsigned().

svn path=/trunk/; revision=28840
This commit is contained in:
Stig Bjørlykke 2009-06-25 02:07:17 +00:00
parent 26bd9f3623
commit 7221f30ab3
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
epan/to_str.c
View File

@ -426,6 +426,61 @@ time_secs_to_str(gint32 time)
return buf->str;
}
static void
time_secs_to_str_buf_unsigned(guint32 time, guint32 frac, gboolean is_nsecs,
emem_strbuf_t *buf)
{
int hours, mins, secs;
const gchar *msign = "";
gboolean do_comma = FALSE;
secs = time % 60;
time /= 60;
mins = time % 60;
time /= 60;
hours = time % 24;
time /= 24;
if (time != 0) {
ep_strbuf_append_printf(buf, "%s%u day%s", msign, time, PLURALIZE(time));
do_comma = TRUE;
}
if (hours != 0) {
ep_strbuf_append_printf(buf, "%s%s%u hour%s", COMMA(do_comma), msign, hours, PLURALIZE(hours));
do_comma = TRUE;
}
if (mins != 0) {
ep_strbuf_append_printf(buf, "%s%s%u minute%s", COMMA(do_comma), msign, mins, PLURALIZE(mins));
do_comma = TRUE;
}
if (secs != 0 || frac != 0) {
if (frac != 0) {
if (is_nsecs)
ep_strbuf_append_printf(buf, "%s%s%u.%09u seconds", COMMA(do_comma), msign, secs, frac);
else
ep_strbuf_append_printf(buf, "%s%s%u.%03u seconds", COMMA(do_comma), msign, secs, frac);
} else
ep_strbuf_append_printf(buf, "%s%s%u second%s", COMMA(do_comma), msign, secs, PLURALIZE(secs));
}
}
gchar *
time_secs_to_str_unsigned(guint32 time)
{
emem_strbuf_t *buf;
buf=ep_strbuf_sized_new(TIME_SECS_LEN+1, TIME_SECS_LEN+1);
if (time == 0) {
ep_strbuf_append(buf, "0 time");
return buf->str;
}
time_secs_to_str_buf_unsigned(time, 0, FALSE, buf);
return buf->str;
}
gchar *
time_msecs_to_str(gint32 time)
{

1
epan/to_str.h
View File

@ -69,6 +69,7 @@ extern gchar* ipxnet_to_str_punct(const guint32 ad, char punct);
extern gchar* vines_addr_to_str(const guint8 *addrp);
extern void vines_addr_to_str_buf(const guint8 *addrp, gchar *buf, int buf_len);
extern gchar* time_secs_to_str(gint32);
extern gchar* time_secs_to_str_unsigned(guint32);
extern gchar* time_msecs_to_str(gint32);
extern gchar* abs_time_to_str(nstime_t*);
extern gchar* abs_time_secs_to_str(time_t);