diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-08-07 17:44:06 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-08-07 22:53:07 +0000 |
| commit | e63db3ce0ec2e92d69b5e452f71f5c44cd205272 (patch) | |
| tree | a51ded32f3301f9385e4ea5983e84388e4ed0f4d | |
| parent | c6963b1c2f87c5f7a9123aa9e8e843540c18ff41 (diff) | |
Rename reentrant range_foreach2 to range_foreach_r
to avoid mistaking it for a range function that operates on pairs.
Change-Id: If9117c195ba21d55a476c3b9deb2a2ca7a1056ed
Reviewed-on: https://code.wireshark.org/review/22994
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/addr_resolv.c | 2 | ||||
| -rw-r--r-- | epan/range.c | 2 | ||||
| -rw-r--r-- | epan/range.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index f7e1911aa9..26366fd40d 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -522,7 +522,7 @@ parse_service_line (char *line) } cb_data.service = service; cb_data.proto = proto; - range_foreach2(port_rng, add_serv_port_cb, &cb_data); + range_foreach_r(port_rng, add_serv_port_cb, &cb_data); } wmem_free (NULL, port_rng); diff --git a/epan/range.c b/epan/range.c index 1d4268967c..f1e8e1d950 100644 --- a/epan/range.c +++ b/epan/range.c @@ -414,7 +414,7 @@ range_foreach(range_t *range, void (*callback)(guint32 val)) } } -void range_foreach2(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr) +void range_foreach_r(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr) { guint32 i, j; diff --git a/epan/range.h b/epan/range.h index 9c3eaf94a0..2e440b30ef 100644 --- a/epan/range.h +++ b/epan/range.h @@ -143,7 +143,7 @@ WS_DLL_PUBLIC void range_foreach(range_t *range, void (*callback)(guint32 val)); * @param callback2 the callback function * @param ptr pointer passed to the callback */ -WS_DLL_PUBLIC void range_foreach2(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr); +WS_DLL_PUBLIC void range_foreach_r(range_t *range, void (*callback2)(guint32 val, gpointer ptr), gpointer ptr); /** * This function converts a range_t to a (wmem_alloc()-allocated) string. |