diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-09 19:50:09 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-12 14:25:12 +0000 |
| commit | 7967ef9510f81e40c75c2907b632b7b672d5fb49 (patch) | |
| tree | 45b376aa004be1ec521b23904d8f624198a62da4 /epan/range.c | |
| parent | 554a3972cd085a17d7f7a9ed4d235234994907a3 (diff) | |
Remove emem APIs from UAT functionality.
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
Reviewed-on: https://code.wireshark.org/review/6460
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/range.c')
| -rw-r--r-- | epan/range.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/range.c b/epan/range.c index 6783ec9382..0101a8d86e 100644 --- a/epan/range.c +++ b/epan/range.c @@ -322,27 +322,27 @@ range_foreach(range_t *range, void (*callback)(guint32 val)) } } -/* This function converts a range_t to a (ep_alloc()-allocated) string. */ +/* This function converts a range_t to a (wmem-allocated) string. */ char * -range_convert_range(range_t *range) +range_convert_range(wmem_allocator_t *scope, range_t *range) { guint32 i; gboolean prepend_comma = FALSE; - emem_strbuf_t *strbuf; + wmem_strbuf_t *strbuf; - strbuf=ep_strbuf_new(NULL); + strbuf=wmem_strbuf_new(scope, ""); if (range) { for (i=0; i < range->nranges; i++) { if (range->ranges[i].low == range->ranges[i].high) { - ep_strbuf_append_printf(strbuf, "%s%u", prepend_comma?",":"", range->ranges[i].low); + wmem_strbuf_append_printf(strbuf, "%s%u", prepend_comma?",":"", range->ranges[i].low); } else { - ep_strbuf_append_printf(strbuf, "%s%u-%u", prepend_comma?",":"", range->ranges[i].low, range->ranges[i].high); + wmem_strbuf_append_printf(strbuf, "%s%u-%u", prepend_comma?",":"", range->ranges[i].low, range->ranges[i].high); } prepend_comma = TRUE; } } - return strbuf->str; + return wmem_strbuf_finalize(strbuf); } /* Create a copy of a range. */ |