diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-19 16:20:42 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-20 00:21:27 +0000 |
| commit | df1f919b9442f97c04e4e916ab4eb522c6a28a3e (patch) | |
| tree | 53323602801b9032747347592f93b79e5a5f096f /epan/column-utils.c | |
| parent | dba361be1a6c8b5ffde3d16a4625df5af67383ad (diff) | |
| download | wireshark-df1f919b9442f97c04e4e916ab4eb522c6a28a3e.tar.gz | |
Don't use g_slist_free_full().
It's only in GLib 2.28 or later, but we don't require 2.28.
Instead, have col_custom_field_ids_free() do what g_slist_free_full() does -
and more.
Change-Id: I15768cfd2d26c847470b02ea6c51830dabcaa7ee
Reviewed-on: https://code.wireshark.org/review/5894
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 95615d9961..161f730a88 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -77,9 +77,19 @@ col_setup(column_info *cinfo, const gint num_cols) } static void -col_custom_field_ids_free(gpointer data) +col_custom_ids_free_wrapper(gpointer data, gpointer user_data _U_) { - g_free(data); + g_free(data); +} + +static void +col_custom_field_ids_free(column_info *cinfo, int col) +{ + if (cinfo->col_custom_field_ids[col] != NULL) { + g_slist_foreach(cinfo->col_custom_field_ids[col], col_custom_ids_free_wrapper, NULL); + g_slist_free(cinfo->col_custom_field_ids[col]); + } + cinfo->col_custom_field_ids[col] = NULL; } /* Cleanup all the data structures for constructing column data; undoes @@ -96,8 +106,7 @@ col_cleanup(column_info *cinfo) dfilter_free(cinfo->col_custom_dfilter[i]); g_free(cinfo->col_buf[i]); g_free(cinfo->col_expr.col_expr_val[i]); - if (cinfo->col_custom_field_ids[i]) - g_slist_free_full(cinfo->col_custom_field_ids[i], col_custom_field_ids_free); + col_custom_field_ids_free(cinfo, i); } g_free(cinfo->col_fmt); @@ -324,10 +333,7 @@ col_custom_prime_edt(epan_dissect_t *edt, column_info *cinfo) i <= cinfo->col_last[COL_CUSTOM]; i++) { int i_list = 0; - if (cinfo->col_custom_field_ids[i]) - g_slist_free_full(cinfo->col_custom_field_ids[i], col_custom_field_ids_free); - - cinfo->col_custom_field_ids[i] = NULL; + col_custom_field_ids_free(cinfo, i); if (cinfo->fmt_matx[i][COL_CUSTOM] && cinfo->col_custom_dfilter[i]) { |