Index: webrtc/voice_engine/test/channel_transport/traffic_control_win.cc |
diff --git a/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc b/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc |
index c0fc76dccca5aec8af28ce6a35bbe2c6b32b88bd..33dc47ced266098c573ff0d4b4f9f54fa146433a 100644 |
--- a/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc |
+++ b/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc |
@@ -17,7 +17,7 @@ |
namespace webrtc { |
namespace test { |
-TrafficControlWindows* TrafficControlWindows::instance = NULL; |
+TrafficControlWindows* TrafficControlWindows::instance = nullptr; |
uint32_t TrafficControlWindows::refCounter = 0; |
TrafficControlWindows::TrafficControlWindows(const int32_t id) |
@@ -27,53 +27,45 @@ TrafficControlWindows::TrafficControlWindows(const int32_t id) |
TrafficControlWindows* TrafficControlWindows::GetInstance( |
const int32_t id) |
{ |
- if(instance != NULL) |
- { |
- WEBRTC_TRACE( |
- kTraceDebug, |
- kTraceTransport, |
- id, |
- "TrafficControlWindows - Returning already created object"); |
- refCounter++; |
- return instance; |
+ if (instance != nullptr) { |
+ WEBRTC_TRACE(kTraceDebug, kTraceTransport, id, |
+ "TrafficControlWindows - Returning already created object"); |
+ refCounter++; |
+ return instance; |
} |
WEBRTC_TRACE(kTraceMemory, kTraceTransport, id, |
"TrafficControlWindows - Creating new object"); |
instance = new TrafficControlWindows(id); |
- if(instance == NULL) |
- { |
- WEBRTC_TRACE(kTraceMemory, kTraceTransport, id, |
- "TrafficControlWindows - Error allocating memory"); |
- return NULL; |
+ if (instance == nullptr) { |
+ WEBRTC_TRACE(kTraceMemory, kTraceTransport, id, |
+ "TrafficControlWindows - Error allocating memory"); |
+ return nullptr; |
} |
- instance->tcRegister = NULL; |
- instance->tcDeregister = NULL; |
+ instance->tcRegister = nullptr; |
+ instance->tcDeregister = nullptr; |
- instance->tcEnumerate = NULL; |
- instance->tcOpenInterface = NULL; |
- instance->tcCloseInterface = NULL; |
+ instance->tcEnumerate = nullptr; |
+ instance->tcOpenInterface = nullptr; |
+ instance->tcCloseInterface = nullptr; |
- instance->tcAddFlow = NULL; |
- instance->tcDeleteFlow = NULL; |
+ instance->tcAddFlow = nullptr; |
+ instance->tcDeleteFlow = nullptr; |
- instance->tcAddFilter = NULL; |
- instance->tcDeleteFilter = NULL; |
+ instance->tcAddFilter = nullptr; |
+ instance->tcDeleteFilter = nullptr; |
HMODULE trafficLib = LoadLibrary(TEXT("traffic.dll")); |
- if(trafficLib == NULL) |
- { |
- WEBRTC_TRACE( |
- kTraceWarning, |
- kTraceTransport, |
- id, |
- "TrafficControlWindows - No QOS support, LoadLibrary returned NULL,\ |
+ if (trafficLib == nullptr) { |
+ WEBRTC_TRACE( |
+ kTraceWarning, kTraceTransport, id, |
+ "TrafficControlWindows - No QOS support, LoadLibrary returned nullptr,\ |
last error: %d\n", |
- GetLastError()); |
- delete instance; |
- instance = NULL; |
- return NULL; |
+ GetLastError()); |
+ delete instance; |
+ instance = nullptr; |
+ return nullptr; |
} |
instance->tcRegister = (registerFn)GetProcAddress(trafficLib, |
@@ -99,41 +91,28 @@ TrafficControlWindows* TrafficControlWindows::GetInstance( |
instance->tcDeleteFilter = (filterDeleteFn)GetProcAddress(trafficLib, |
"TcDeleteFilter"); |
- if(instance->tcRegister == NULL || |
- instance->tcDeregister == NULL || |
- instance->tcEnumerate == NULL || |
- instance->tcOpenInterface == NULL || |
- instance->tcCloseInterface == NULL || |
- instance->tcAddFlow == NULL || |
- instance->tcAddFilter == NULL || |
- instance->tcDeleteFlow == NULL || |
- instance->tcDeleteFilter == NULL) |
- { |
- delete instance; |
- instance = NULL; |
- WEBRTC_TRACE( |
- kTraceError, |
- kTraceTransport, |
- id, |
- "TrafficControlWindows - Could not find function pointer for\ |
+ if (instance->tcRegister == nullptr || instance->tcDeregister == nullptr || |
+ instance->tcEnumerate == nullptr || |
+ instance->tcOpenInterface == nullptr || |
+ instance->tcCloseInterface == nullptr || |
+ instance->tcAddFlow == nullptr || instance->tcAddFilter == nullptr || |
+ instance->tcDeleteFlow == nullptr || |
+ instance->tcDeleteFilter == nullptr) { |
+ delete instance; |
+ instance = nullptr; |
+ WEBRTC_TRACE(kTraceError, kTraceTransport, id, |
+ "TrafficControlWindows - Could not find function pointer for\ |
traffic control functions"); |
- WEBRTC_TRACE( |
- kTraceError, |
- kTraceTransport, |
- id, |
- "Tcregister : %x, tcDeregister: %x, tcEnumerate: %x,\ |
+ WEBRTC_TRACE(kTraceError, kTraceTransport, id, |
+ "Tcregister : %x, tcDeregister: %x, tcEnumerate: %x,\ |
tcOpenInterface: %x, tcCloseInterface: %x, tcAddFlow: %x, tcAddFilter: %x,\ |
tcDeleteFlow: %x, tcDeleteFilter: %x", |
- instance->tcRegister, |
- instance->tcDeregister, |
- instance->tcEnumerate, |
- instance->tcOpenInterface, |
- instance->tcCloseInterface, |
- instance->tcAddFlow, |
- instance->tcAddFilter, |
- instance->tcDeleteFlow, |
- instance->tcDeleteFilter ); |
- return NULL; |
+ instance->tcRegister, instance->tcDeregister, |
+ instance->tcEnumerate, instance->tcOpenInterface, |
+ instance->tcCloseInterface, instance->tcAddFlow, |
+ instance->tcAddFilter, instance->tcDeleteFlow, |
+ instance->tcDeleteFilter); |
+ return nullptr; |
} |
refCounter++; |
return instance; |
@@ -147,11 +126,10 @@ void TrafficControlWindows::Release(TrafficControlWindows* gtc) |
"TrafficControlWindows - Cannot release, refCounter is 0"); |
return; |
} |
- if (NULL == gtc) |
- { |
- WEBRTC_TRACE(kTraceDebug, kTraceTransport, -1, |
- "TrafficControlWindows - Not releasing, gtc is NULL"); |
- return; |
+ if (nullptr == gtc) { |
+ WEBRTC_TRACE(kTraceDebug, kTraceTransport, -1, |
+ "TrafficControlWindows - Not releasing, gtc is null"); |
+ return; |
} |
WEBRTC_TRACE(kTraceDebug, kTraceTransport, -1, |
@@ -162,7 +140,7 @@ void TrafficControlWindows::Release(TrafficControlWindows* gtc) |
WEBRTC_TRACE(kTraceMemory, kTraceTransport, -1, |
"TrafficControlWindows - Deleting object"); |
delete instance; |
- instance = NULL; |
+ instance = nullptr; |
} |
} |
@@ -172,16 +150,16 @@ ULONG TrafficControlWindows::TcRegisterClient( |
PTCI_CLIENT_FUNC_LIST ClientHandlerList, |
PHANDLE pClientHandle) |
{ |
- assert(tcRegister != NULL); |
+ assert(tcRegister != nullptr); |
- return tcRegister(TciVersion, ClRegCtx, ClientHandlerList, pClientHandle); |
+ return tcRegister(TciVersion, ClRegCtx, ClientHandlerList, pClientHandle); |
} |
ULONG TrafficControlWindows::TcDeregisterClient(HANDLE clientHandle) |
{ |
- assert(tcDeregister != NULL); |
+ assert(tcDeregister != nullptr); |
- return tcDeregister(clientHandle); |
+ return tcDeregister(clientHandle); |
} |
@@ -190,9 +168,9 @@ ULONG TrafficControlWindows::TcEnumerateInterfaces( |
PULONG pBufferSize, |
PTC_IFC_DESCRIPTOR interfaceBuffer) |
{ |
- assert(tcEnumerate != NULL); |
+ assert(tcEnumerate != nullptr); |
- return tcEnumerate(ClientHandle, pBufferSize, interfaceBuffer); |
+ return tcEnumerate(ClientHandle, pBufferSize, interfaceBuffer); |
} |
@@ -201,46 +179,44 @@ ULONG TrafficControlWindows::TcOpenInterfaceW(LPWSTR pInterfaceName, |
HANDLE ClIfcCtx, |
PHANDLE pIfcHandle) |
{ |
- assert(tcOpenInterface != NULL); |
- |
- return tcOpenInterface(pInterfaceName, ClientHandle, ClIfcCtx, pIfcHandle); |
+ assert(tcOpenInterface != nullptr); |
+ return tcOpenInterface(pInterfaceName, ClientHandle, ClIfcCtx, pIfcHandle); |
} |
ULONG TrafficControlWindows::TcCloseInterface(HANDLE IfcHandle) |
{ |
- assert(tcCloseInterface != NULL); |
+ assert(tcCloseInterface != nullptr); |
- return tcCloseInterface(IfcHandle); |
+ return tcCloseInterface(IfcHandle); |
} |
ULONG TrafficControlWindows::TcAddFlow(HANDLE IfcHandle, HANDLE ClFlowCtx, |
ULONG Flags, PTC_GEN_FLOW pGenericFlow, |
PHANDLE pFlowHandle) |
{ |
- assert(tcAddFlow != NULL); |
- return tcAddFlow(IfcHandle, ClFlowCtx, Flags, pGenericFlow, pFlowHandle); |
+ assert(tcAddFlow != nullptr); |
+ return tcAddFlow(IfcHandle, ClFlowCtx, Flags, pGenericFlow, pFlowHandle); |
} |
ULONG TrafficControlWindows::TcAddFilter(HANDLE FlowHandle, |
PTC_GEN_FILTER pGenericFilter, |
PHANDLE pFilterHandle) |
{ |
- assert(tcAddFilter != NULL); |
- return tcAddFilter(FlowHandle, pGenericFilter, pFilterHandle); |
+ assert(tcAddFilter != nullptr); |
+ return tcAddFilter(FlowHandle, pGenericFilter, pFilterHandle); |
} |
ULONG TrafficControlWindows::TcDeleteFlow(HANDLE FlowHandle) |
{ |
- assert(tcDeleteFlow != NULL); |
- return tcDeleteFlow(FlowHandle); |
- |
+ assert(tcDeleteFlow != nullptr); |
+ return tcDeleteFlow(FlowHandle); |
} |
ULONG TrafficControlWindows::TcDeleteFilter(HANDLE FilterHandle) |
{ |
- assert(tcDeleteFilter != NULL); |
- return tcDeleteFilter(FilterHandle); |
+ assert(tcDeleteFilter != nullptr); |
+ return tcDeleteFilter(FilterHandle); |
} |
void MyClNotifyHandler(HANDLE ClRegCtx, HANDLE ClIfcCtx, ULONG Event, |