aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/follow_stream_dialog.cpp
diff options
context:
space:
mode:
authorRoland Knall <rknall@gmail.com>2019-08-14 10:18:51 +0200
committerRoland Knall <rknall@gmail.com>2019-08-30 13:37:25 +0000
commita53545c0c81ac71aaa10ae91d080f1640551b5b8 (patch)
tree77bf1f42dfa8d10607a05b69929f5efcaa36c6eb /ui/qt/follow_stream_dialog.cpp
parentb43ff704446cd7a3b4c5dc3fa4268f5ebac2c326 (diff)
Qt: Add macro for g_list_next for C++
Using a simple (type *) cast on g_list_next results in a warning with modern compilers "old-style cast" Adding a warning for g_list_next and data access to avoid the warning A good overview why reinterpret_cast has been used can be found here: https://stackoverflow.com/questions/332030/when-should-static-cast-dynamic-cast-const-cast-and-reinterpret-cast-be-used It is a 1:1 replacement in this case, but does not use any of the new cast styles and therefore should be used with caution. Change-Id: I989f237afc39aaf40133a788b1c0bbd7a51bf974 Reviewed-on: https://code.wireshark.org/review/34284 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/follow_stream_dialog.cpp')
-rw-r--r--ui/qt/follow_stream_dialog.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 6af72f133c..d6f96f7679 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -400,8 +400,8 @@ void FollowStreamDialog::resetStream()
if (!data_out_filename_.isEmpty()) {
ws_unlink(data_out_filename_.toUtf8().constData());
}
- for (cur = follow_info_.payload; cur; cur = g_list_next(cur)) {
- follow_record = (follow_record_t *)cur->data;
+ for (cur = follow_info_.payload; cur; cur = gxx_list_next(cur)) {
+ follow_record = gxx_list_data(follow_record_t *, cur);
if(follow_record->data) {
g_byte_array_free(follow_record->data, TRUE);
}
@@ -411,25 +411,25 @@ void FollowStreamDialog::resetStream()
//Only TCP stream uses fragments
if (follow_type_ == FOLLOW_TCP) {
- for (cur = follow_info_.fragments[0]; cur; cur = g_list_next(cur)) {
- follow_record = (follow_record_t *)cur->data;
+ for (cur = follow_info_.fragments[0]; cur; cur = gxx_list_next(cur)) {
+ follow_record = gxx_list_data(follow_record_t *, cur);
if(follow_record->data) {
g_byte_array_free(follow_record->data, TRUE);
}
g_free(follow_record);
}
- follow_info_.fragments[0] = NULL;
- for (cur = follow_info_.fragments[1]; cur; cur = g_list_next(cur)) {
- follow_record = (follow_record_t *)cur->data;
+ follow_info_.fragments[0] = Q_NULLPTR;
+ for (cur = follow_info_.fragments[1]; cur; cur = gxx_list_next(cur)) {
+ follow_record = gxx_list_data(follow_record_t *, cur);
if(follow_record->data) {
g_byte_array_free(follow_record->data, TRUE);
}
g_free(follow_record);
}
- follow_info_.fragments[1] = NULL;
+ follow_info_.fragments[1] = Q_NULLPTR;
}
- follow_info_.payload = NULL;
+ follow_info_.payload = Q_NULLPTR;
follow_info_.client_port = 0;
}