From f4c70bcd6fffed6062d2dfb11fd3d6ffed8a4fa3 Mon Sep 17 00:00:00 2001 From: Anthony Berglund Date: Fri, 19 Jan 2018 17:09:40 -0500 Subject: [PATCH] Changing flag name Changing flag name --- etw/common.py | 2 +- etw/etw.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etw/common.py b/etw/common.py index b7f457e..3713a00 100644 --- a/etw/common.py +++ b/etw/common.py @@ -25,7 +25,7 @@ RETURN_RAW_DATA_ONLY = 0x1 RETURN_RAW_DATA_ON_ERROR = 0x2 RETURN_ONLY_RAW_DATA_ON_ERROR = 0x4 -RETURN_UNFORMATTED_DATA = 0x8 +RETURN_RAW_UNFORMATTED_DATA = 0x8 if ct.sizeof(ct.c_void_p) == 8: ULONG_PTR = ct.c_ulonglong diff --git a/etw/etw.py b/etw/etw.py index 846aad4..8fb428b 100644 --- a/etw/etw.py +++ b/etw/etw.py @@ -30,7 +30,7 @@ from etw import wmistr as ws from etw import tdh as tdh from etw.common import rel_ptr_to_str, MAX_UINT, ETWException, RETURN_RAW_DATA_ONLY, RETURN_RAW_DATA_ON_ERROR, \ - RETURN_ONLY_RAW_DATA_ON_ERROR, RETURN_UNFORMATTED_DATA + RETURN_ONLY_RAW_DATA_ON_ERROR, RETURN_RAW_UNFORMATTED_DATA logger = logging.getLogger(__name__) @@ -615,7 +615,7 @@ def _processEvent(self, record): field_parse_error = False raw_msg = True - if self.callback_data_flag == RETURN_UNFORMATTED_DATA: + if self.callback_data_flag == RETURN_RAW_UNFORMATTED_DATA: event_id = 0 out = record else: @@ -718,7 +718,7 @@ def _processEvent(self, record): ((self.callback_data_flag == RETURN_RAW_DATA_ON_ERROR or self.callback_data_flag == RETURN_ONLY_RAW_DATA_ON_ERROR) and (field_parse_error is True or raw_msg is True)) or \ - (self.callback_data_flag == RETURN_UNFORMATTED_DATA and raw_msg is True) or\ + (self.callback_data_flag == RETURN_RAW_UNFORMATTED_DATA and raw_msg is True) or\ (self.callback_data_flag == 0 and raw_msg is False): if self.event_callback: