osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Replace some lingering references to g_log()

This commit is contained in:
João Valverde 2021-06-18 16:52:20 +01:00 committed by Guy Harris
parent 145ba2e071
commit 8cf9791679
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-jxta.c
View File

@ -1270,8 +1270,8 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
* when the message_version is valid but the JXTA_MSGELEM_SIG
* (some sort of magic number?) is not. This almost
* certainly indicates a corrupt packet, so this should
* probably be expert info, not a g_warning. Pending confirmation
* just comment it out since a g_warning is definitely the
* probably be expert info, not a ws_warning. Pending confirmation
* just comment it out since a ws_warning is definitely the
* wrong thing to do.
* ws_warning( "Failure processing message element #%d of %d of frame %d", each_elem, elem_count, pinfo->num );
*/

4
epan/proto.c
View File

@ -7352,7 +7352,7 @@ proto_register_protocol(const char *name, const char *short_name,
*/
if (g_hash_table_lookup(proto_names, name)) {
/* g_error will terminate the program */
/* ws_error will terminate the program */
ws_error("Duplicate protocol name \"%s\"!"
" This might be caused by an inappropriate plugin or a development error.", name);
}
@ -8916,7 +8916,7 @@ proto_register_subtree_array(gint * const *indices, const int num_indices)
*/
for (i = 0; i < num_indices; i++, ptr++, num_tree_types++) {
if (**ptr != -1) {
/* g_error will terminate the program */
/* ws_error will terminate the program */
ws_error("register_subtree_array: subtree item type (ett_...) not -1 !"
" This is a development error:"
" Either the subtree item type has already been assigned or"

2
plugins/epan/mate/mate_parser.l
View File

@ -220,7 +220,7 @@ blk_cmnt_stop "*/"
<INCLUDING>{filename} {
if ( yyextra->include_stack_ptr >= MAX_INCLUDE_DEPTH )
g_error("dtd_preparse: include files nested too deeply");
ws_error("dtd_preparse: include files nested too deeply");
yyextra->include_stack[yyextra->include_stack_ptr++] = YY_CURRENT_BUFFER;
yyin = ws_fopen( yytext, "r" );

2
ui/qt/main_window.cpp
View File

@ -1809,7 +1809,7 @@ bool MainWindow::testCaptureFileClose(QString before_what, FileCloseContext cont
* callers should be modified to check this condition and act
* accordingly (ignore action or queue it up), so print a warning.
*/
g_warning("Refusing to close \"%s\" which is being read.", capture_file_.capFile()->filename);
ws_warning("Refusing to close \"%s\" which is being read.", capture_file_.capFile()->filename);
return false;
}

3
ui/qt/models/proto_tree_model.cpp
View File

@ -10,6 +10,7 @@
#include <ui/qt/models/proto_tree_model.h>
#include <epan/prefs.h>
#include <wsutil/wslog.h>
#include <ui/qt/utils/color_utils.h>
@ -110,7 +111,7 @@ QVariant ProtoTreeModel::data(const QModelIndex &index, int role) const
case(PI_ERROR):
return ColorUtils::expert_color_error;
default:
g_warning("%s:%d Unhandled severity flag: %u", G_STRFUNC, __LINE__, finfo.flag(PI_SEVERITY_MASK));
ws_warning("Unhandled severity flag: %u", finfo.flag(PI_SEVERITY_MASK));
}
if (finfo.headerInfo().type == FT_PROTOCOL) {
return QApplication::palette().window();

3
ui/qt/packet_list.cpp
View File

@ -35,6 +35,7 @@
#include "ui/util.h"
#include "wsutil/str_util.h"
#include <wsutil/wslog.h>
#include <epan/color_filters.h>
#include "frame_tvbuff.h"
@ -1730,7 +1731,7 @@ void PacketList::sectionMoved(int logicalIndex, int oldVisualIndex, int newVisua
// Since we undo the move below, these should always stay in sync.
// Otherwise the order of columns can be unexpected after drag and drop.
if (logicalIndex != oldVisualIndex) {
g_warning("Column moved from an unexpected state (%d, %d, %d)",
ws_warning("Column moved from an unexpected state (%d, %d, %d)",
logicalIndex, oldVisualIndex, newVisualIndex);
}

3
wiretap/ascend_parser.lemon
View File

@ -124,6 +124,7 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet
#include "ascend_parser.h"
#include "ascend_scanner_lex.h"
#include "file_wrappers.h"
#include <wsutil/wslog.h>
#define NO_USER "<none>"
@ -134,7 +135,7 @@ static void AscendParserFree(void *p, void (*freeProc)(void*));
#if 0
#define ASCEND_PARSER_DEBUG 1
#undef NDEBUG
#define ascend_debug(...) g_warning(__VA_ARGS__)
#define ascend_debug(...) ws_warning(__VA_ARGS__)
#else
#define ascend_debug(...)
#endif