diff options
author | Evan Huus <eapache@gmail.com> | 2014-06-16 10:54:20 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-06-16 19:10:59 +0000 |
commit | e0aabd97d8dc70fb037f487a31268cee15aed445 (patch) | |
tree | 00a9cb378b90812ee96ed64b102a386ea3f16fad /epan/ftypes | |
parent | 9301c5b60545ef52ac55bbf06ea0f349fba582c9 (diff) |
Convert more time_to_str functions to wmem
Change-Id: Ibaae0e79935dc62f12f713f2df5b57d0f3f799b9
Reviewed-on: https://code.wireshark.org/review/2254
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/ftypes')
-rw-r--r-- | epan/ftypes/ftype-time.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c index 67a669da64..8b3471956f 100644 --- a/epan/ftypes/ftype-time.c +++ b/epan/ftypes/ftype-time.c @@ -352,15 +352,22 @@ static int relative_val_repr_len(fvalue_t *fv, ftrepr_t rtype _U_) { gchar *rep; + int ret; - rep = rel_time_to_secs_ep_str(&fv->value.time); - return (int)strlen(rep); + rep = rel_time_to_secs_str(NULL, &fv->value.time); + ret = (int)strlen(rep); + wmem_free(NULL, rep); + + return ret; } static void relative_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf) { - strcpy(buf, rel_time_to_secs_ep_str(&fv->value.time)); + gchar *rep; + rep = rel_time_to_secs_str(NULL, &fv->value.time); + strcpy(buf, rep); + wmem_free(NULL, rep); } void @@ -455,3 +462,16 @@ ftype_register_time(void) ftype_register(FT_ABSOLUTE_TIME, &abstime_type); ftype_register(FT_RELATIVE_TIME, &reltime_type); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |