diff options
| author | Anders <anders.broman@ericsson.com> | 2018-04-16 17:20:34 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-16 16:07:46 +0000 |
| commit | bb81bef5353138e4f8d80387c2a76650f79e4fb6 (patch) | |
| tree | 7ab65d853a781fb5a13eb6af53cfb509b6988bbe /epan/sequence_analysis.c | |
| parent | ccff21854d5e340af3e8db3ecde555a20ce1f7d8 (diff) | |
glib: Get rid of GLIB_CHECK_VERSION as we now require 2.32.0
Change-Id: Ie95cf37f9cd283545693e290340a7489cc989c95
Reviewed-on: https://code.wireshark.org/review/26970
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/sequence_analysis.c')
| -rw-r--r-- | epan/sequence_analysis.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/epan/sequence_analysis.c b/epan/sequence_analysis.c index 28c702292a..28f9adad6d 100644 --- a/epan/sequence_analysis.c +++ b/epan/sequence_analysis.c @@ -228,21 +228,9 @@ sequence_analysis_list_free(seq_analysis_info_t *sainfo) /* free the graph data items */ -#if GLIB_CHECK_VERSION (2, 32, 0) if (sainfo->items != NULL) g_queue_free_full(sainfo->items, sequence_analysis_item_free); sainfo->items = g_queue_new(); -#else - { - GList *list = g_queue_peek_nth_link(sainfo->items, 0); - while (list) - { - sequence_analysis_item_free(list->data); - list = g_list_next(list); - } - g_queue_clear(sainfo->items); - } -#endif if (NULL != sainfo->ht) { g_hash_table_remove_all(sainfo->ht); @@ -368,12 +356,7 @@ static void overwrite (GString *gstr, char *text_to_insert, guint32 p1, guint32 if (len > ins_len) { len = ins_len; } else if (len < ins_len) { -#if GLIB_CHECK_VERSION(2,30,0) ins_str = g_utf8_substring(text_to_insert, 0, len); -#else - gchar *end = g_utf8_offset_to_pointer(text_to_insert, len); - ins_str = g_strndup(text_to_insert, end - text_to_insert); -#endif } if (!ins_str) ins_str = g_strdup(text_to_insert); |