diff options
| author | Evan Huus <eapache@gmail.com> | 2012-09-05 01:44:09 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-09-05 01:44:09 +0000 |
| commit | 471b4d94efd82d5db3687f9be1a276b29d1533ae (patch) | |
| tree | 6a22e4422d5789753ea13c71830008cdcd6a0b0d /ui | |
| parent | 5cdcf9c280435d9ba6b388e273cb4c87c790a7a6 (diff) | |
| download | wireshark-471b4d94efd82d5db3687f9be1a276b29d1533ae.tar.gz | |
Remove string constants from g_assert() calls, as per thread on wireshark-dev:
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html
svn path=/trunk/; revision=44774
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/dcerpc_stat.c | 3 | ||||
| -rw-r--r-- | ui/gtk/io_stat.c | 3 | ||||
| -rw-r--r-- | ui/gtk/proto_tree_model.c | 3 | ||||
| -rw-r--r-- | ui/gtk/rtp_analysis.c | 3 | ||||
| -rw-r--r-- | ui/qt/proto_tree.cpp | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index 8f82c1d56e..7588700567 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -434,7 +434,8 @@ dcerpcstat_program_select(GtkWidget *prog_combo_box, gpointer user_data) g_signal_handlers_disconnect_by_func(vers_combo_box, G_CALLBACK(dcerpcstat_version_select), NULL ); ws_combo_box_clear_text_and_pointer(GTK_COMBO_BOX(vers_combo_box)); - g_assert((k != NULL) && "dcerpc_stat: invalid selection"); /* Somehow selected top level ?? */ + /* dcerpc_stat: invalid selection... somehow selected top level ?? */ + g_assert(k != NULL); dcerpc_uuid_program = &(k->uuid); /* re-create version menu */ diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 1d579fd0aa..44954e80a8 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -1457,7 +1457,8 @@ iostat_init(const char *optarg _U_, void* userdata _U_) io_stat_reset(io); error_string=enable_graph(&io->graphs[0], NULL, NULL); - g_assert((error_string == NULL) && "Can't attach io_stat tap !"); + /* Can't attach io_stat tap ! */ + g_assert(error_string == NULL); #if 0 if(error_string){ diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index 3bef612946..d6ed53d200 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -195,7 +195,8 @@ proto_tree_model_get_value(GtkTreeModel *tree_model, GtkTreeIter *iter, gint col node = iter->user_data; fi = PNODE_FINFO(node); - g_assert(fi && "dissection with an invisible proto tree?"); + /* dissection with an invisible proto tree? */ + g_assert(fi); switch (column) { case 0: diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 43185ef389..3071841df2 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -3588,7 +3588,8 @@ static gboolean process_node(proto_node *ptree_node, header_field_info *hfinform finfo = PNODE_FINFO(ptree_node); - g_assert(finfo && "Caller passed top of the protocol tree. Expected child node"); + /* Caller passed top of the protocol tree. Expected child node */ + g_assert(finfo); if (hfinformation==(finfo->hfinfo)) { hfssrc = proto_registrar_get_byname(proto_field); diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp index 2535f579d3..09157d96c3 100644 --- a/ui/qt/proto_tree.cpp +++ b/ui/qt/proto_tree.cpp @@ -51,7 +51,8 @@ proto_tree_draw_node(proto_node *node, gpointer data) gchar *label_ptr; gboolean is_leaf; - g_assert(fi && "dissection with an invisible proto tree?"); + /* dissection with an invisible proto tree? */ + g_assert(fi); if (PROTO_ITEM_IS_HIDDEN(node) && !prefs.display_hidden_proto_items) return; |