diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-31 07:51:19 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 17:08:47 +0000 |
| commit | 51a30142251e377ec28eb8584c56386c2481d6c0 (patch) | |
| tree | 4a4667a656f60327647805022e5811b6f2c42052 /ui/qt | |
| parent | 0165b8c40cfd6ca529408862095c1213bdf1ebd5 (diff) | |
format_text_wmem -> format_text
All cases of the "original" format_text have been handled to add the
proper wmem allocator scope. Remove the "original" format_text
and replace it with one that has a wmem allocator as a parameter.
Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719
Reviewed-on: https://code.wireshark.org/review/19884
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/wlan_statistics_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp index 08b58acd90..7a08b05c94 100644 --- a/ui/qt/wlan_statistics_dialog.cpp +++ b/ui/qt/wlan_statistics_dialog.cpp @@ -234,7 +234,7 @@ public: } else if (wlan_hdr->stats.ssid_len == 1 && wlan_hdr->stats.ssid[0] == 0) { ssid_text = QObject::tr("<Hidden>"); } else { - gchar *str = format_text_wmem(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len); + gchar *str = format_text(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len); ssid_text = str; wmem_free(NULL, str); } @@ -307,7 +307,7 @@ public: if (update_ssid) { gchar* str; ssid_ = QByteArray::fromRawData((const char *)wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len); - str = format_text_wmem(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len); + str = format_text(NULL, wlan_hdr->stats.ssid, wlan_hdr->stats.ssid_len); setText(col_ssid_, str); wmem_free(NULL, str); is_ssid_match = true; |