diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-12-29 00:00:59 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-12-29 08:01:54 +0000 |
commit | ddd217469de7032a3509369b3ca7dfca55374c2e (patch) | |
tree | 781bd60b0289cd9d0c8cabfacecbe0eb8df7c76e /ui/gtk/rlc_lte_graph.c | |
parent | 98456ce10f92dcb58c65ca0506c143d5e767ddd1 (diff) |
Always supply a g_mallocated error message from select_rlc_lte_session().
That way, we don't have to pass a "free this" indication separately.
While we're at it, don't just free the error message, *display* it in
all cases where rlc_graph_segment_list_get() fails.
(I wish more programming languages had a proper string type, including
some whose names consist solely of the third letter of the alphabet, but
I digress....)
Change-Id: I99f8b088aa19bc8fbb178bdb36d85ba5b89c06e0
Reviewed-on: https://code.wireshark.org/review/12902
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/rlc_lte_graph.c')
-rw-r--r-- | ui/gtk/rlc_lte_graph.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index a352b21a20..efb314693f 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -376,16 +376,13 @@ void rlc_lte_graph_cb(GtkAction *action _U_, gpointer user_data _U_) struct rlc_segment current; struct gtk_rlc_graph *g; gchar *err_msg = NULL; - gboolean free_err_msg = FALSE; debug(DBS_FENTRY) puts("rlc_lte_graph_cb()"); /* Can we choose an RLC channel from the selected frame? */ - if (!select_rlc_lte_session(&cfile, ¤t, &err_msg, &free_err_msg)) { + if (!select_rlc_lte_session(&cfile, ¤t, &err_msg)) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); - if (free_err_msg) { - g_free(err_msg); - } + g_free(err_msg); return; } @@ -397,7 +394,11 @@ void rlc_lte_graph_cb(GtkAction *action _U_, gpointer user_data _U_) graph_initialize_values(g); /* Get our list of segments from the packet list */ - rlc_graph_segment_list_get(&cfile, &(g->graph), FALSE, &err_msg, &free_err_msg); + if (!rlc_graph_segment_list_get(&cfile, &(g->graph), FALSE, &err_msg)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); + return; + } create_gui(g); graph_init_sequence(g); @@ -409,7 +410,6 @@ void rlc_lte_graph_known_channel_launch(guint16 ueid, guint8 rlcMode, { struct gtk_rlc_graph *g; gchar *err_msg = NULL; - gboolean free_err_msg = FALSE; debug(DBS_FENTRY) puts("rlc_lte_graph_known_channel_launch()"); @@ -429,7 +429,11 @@ void rlc_lte_graph_known_channel_launch(guint16 ueid, guint8 rlcMode, g->graph.channelSet = TRUE; /* Get our list of segments from the packet list */ - rlc_graph_segment_list_get(&cfile, &(g->graph), TRUE, &err_msg, &free_err_msg); + if (!rlc_graph_segment_list_get(&cfile, &(g->graph), TRUE, &err_msg)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); + return; + } create_gui(g); graph_init_sequence(g); |