From 1b1614913f63b75b2565e02d05598c7b5ca5464f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 9 May 2016 13:21:44 -0700 Subject: 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 --- epan/to_str.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'epan/to_str.h') 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); -- cgit v1.2.1