summaryrefslogtreecommitdiff
path: root/epan/to_str.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-05-09 13:21:44 -0700
committerGuy Harris <guy@alum.mit.edu>2016-05-09 20:26:13 +0000
commit1b1614913f63b75b2565e02d05598c7b5ca5464f (patch)
tree70f0d8eb134fe625568b6ca70646502c2504464d /epan/to_str.h
parent27646e1cb4a6bc1348921dbff2a2590fcdfeba6e (diff)
downloadwireshark-1b1614913f63b75b2565e02d05598c7b5ca5464f.tar.gz
Shuffle some routines to put absolute-time and relative-time code together.
Put the routines that handle absolute time ("relative to the Epoch") together and the routines that handle relative time together. Change-Id: I15256921091ab67a1d92026385bf1b27aa52b404 Reviewed-on: https://code.wireshark.org/review/15316 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/to_str.h')
-rw-r--r--epan/to_str.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/to_str.h b/epan/to_str.h
index f8b16ff3b6..687395a8dd 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -96,16 +96,18 @@ void ip6_to_str_buf(const struct e_in6_addr *, gchar *);
extern gchar* ipxnet_to_str_punct(wmem_allocator_t *scope, const guint32 ad, const char punct);
WS_DLL_PUBLIC gchar* eui64_to_str(wmem_allocator_t *scope, const guint64 ad);
-WS_DLL_PUBLIC gchar* time_secs_to_str(wmem_allocator_t *scope, const gint32 time_val);
-gchar* time_secs_to_str_unsigned(wmem_allocator_t *scope, const guint32);
-WS_DLL_PUBLIC gchar* time_msecs_to_str(wmem_allocator_t *scope, gint32 time_val);
WS_DLL_PUBLIC gchar* abs_time_to_str(wmem_allocator_t *scope, const nstime_t*, const absolute_time_display_e fmt,
gboolean show_zone);
WS_DLL_PUBLIC gchar* abs_time_secs_to_str(wmem_allocator_t *scope, const time_t, const absolute_time_display_e fmt,
gboolean show_zone);
-WS_DLL_PUBLIC void display_signed_time(gchar *, int, const gint32, gint32, const to_str_time_res_t);
WS_DLL_PUBLIC void display_epoch_time(gchar *, int, const time_t, gint32, const to_str_time_res_t);
+WS_DLL_PUBLIC void display_signed_time(gchar *, int, const gint32, gint32, const to_str_time_res_t);
+
+WS_DLL_PUBLIC gchar* time_secs_to_str(wmem_allocator_t *scope, const gint32 time_val);
+gchar* time_secs_to_str_unsigned(wmem_allocator_t *scope, const guint32);
+WS_DLL_PUBLIC gchar* time_msecs_to_str(wmem_allocator_t *scope, gint32 time_val);
+
extern void guint32_to_str_buf(guint32 u, gchar *buf, int buf_len);
extern void guint64_to_str_buf(guint64 u, gchar *buf, int buf_len);