mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-04-06 23:13:50 +00:00
Convert to C++ nullptr from NULL.
This commit is contained in:
parent
43f8b2f6f0
commit
cf15f42a0f
98 changed files with 1340 additions and 1340 deletions
|
|
@ -46,7 +46,7 @@ m_seen1(false),
|
|||
m_seen2(false),
|
||||
m_seen3(false),
|
||||
m_seen4(false),
|
||||
m_sacch(NULL),
|
||||
m_sacch(nullptr),
|
||||
m_sessionId(1U),
|
||||
m_seqNo(0U),
|
||||
m_ssrc(0U),
|
||||
|
|
@ -107,7 +107,7 @@ bool CNXDNKenwoodNetwork::open()
|
|||
|
||||
bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYPE type)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
switch (type) {
|
||||
case NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER: // Voice header or trailer
|
||||
|
|
@ -127,7 +127,7 @@ bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_
|
|||
|
||||
bool CNXDNKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[30U];
|
||||
::memset(outData, 0x00U, 30U);
|
||||
|
|
@ -171,7 +171,7 @@ bool CNXDNKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData)
|
|||
|
||||
bool CNXDNKenwoodNetwork::processIcomVoiceData(const unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[40U], temp[10U];
|
||||
::memset(outData, 0x00U, 40U);
|
||||
|
|
@ -251,7 +251,7 @@ bool CNXDNKenwoodNetwork::processIcomVoiceData(const unsigned char* inData)
|
|||
|
||||
bool CNXDNKenwoodNetwork::processIcomDataHeader(const unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[30U];
|
||||
::memset(outData, 0x00U, 30U);
|
||||
|
|
@ -295,7 +295,7 @@ bool CNXDNKenwoodNetwork::processIcomDataHeader(const unsigned char* inData)
|
|||
|
||||
bool CNXDNKenwoodNetwork::processIcomDataData(const unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[40U];
|
||||
::memset(outData, 0x00U, 40U);
|
||||
|
|
@ -328,7 +328,7 @@ bool CNXDNKenwoodNetwork::processIcomDataData(const unsigned char* inData)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[50U];
|
||||
::memset(buffer, 0x00U, 50U);
|
||||
|
|
@ -375,7 +375,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[50U];
|
||||
::memset(buffer, 0x00U, 50U);
|
||||
|
|
@ -421,7 +421,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPVoiceData(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[60U];
|
||||
::memset(buffer, 0x00U, 60U);
|
||||
|
|
@ -467,7 +467,7 @@ bool CNXDNKenwoodNetwork::writeRTPVoiceData(const unsigned char* data)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPDataHeader(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[50U];
|
||||
::memset(buffer, 0x00U, 50U);
|
||||
|
|
@ -509,7 +509,7 @@ bool CNXDNKenwoodNetwork::writeRTPDataHeader(const unsigned char* data)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPDataTrailer(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[50U];
|
||||
::memset(buffer, 0x00U, 50U);
|
||||
|
|
@ -551,7 +551,7 @@ bool CNXDNKenwoodNetwork::writeRTPDataTrailer(const unsigned char* data)
|
|||
|
||||
bool CNXDNKenwoodNetwork::writeRTPDataData(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[50U];
|
||||
::memset(buffer, 0x00U, 50U);
|
||||
|
|
@ -605,7 +605,7 @@ bool CNXDNKenwoodNetwork::writeRTCPStart()
|
|||
m_startUSecs = st.wMilliseconds * 1000U;
|
||||
#else
|
||||
struct timeval tod;
|
||||
::gettimeofday(&tod, NULL);
|
||||
::gettimeofday(&tod, nullptr);
|
||||
|
||||
m_startSecs = tod.tv_sec;
|
||||
m_startUSecs = tod.tv_usec;
|
||||
|
|
@ -738,7 +738,7 @@ bool CNXDNKenwoodNetwork::writeRTCPHang()
|
|||
|
||||
bool CNXDNKenwoodNetwork::read(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char dummy[BUFFER_LENGTH];
|
||||
readRTCP(dummy);
|
||||
|
|
@ -764,7 +764,7 @@ bool CNXDNKenwoodNetwork::read(unsigned char* data)
|
|||
|
||||
unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[BUFFER_LENGTH];
|
||||
|
||||
|
|
@ -792,7 +792,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
|
|||
|
||||
unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
assert(data != nullptr);
|
||||
|
||||
unsigned char buffer[BUFFER_LENGTH];
|
||||
|
||||
|
|
@ -868,7 +868,7 @@ void CNXDNKenwoodNetwork::clock(unsigned int ms)
|
|||
|
||||
bool CNXDNKenwoodNetwork::processKenwoodVoiceHeader(unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[50U], temp[20U];
|
||||
::memset(outData, 0x00U, 50U);
|
||||
|
|
@ -925,7 +925,7 @@ bool CNXDNKenwoodNetwork::processKenwoodVoiceHeader(unsigned char* inData)
|
|||
|
||||
bool CNXDNKenwoodNetwork::processKenwoodVoiceData(unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char outData[50U], temp[20U];
|
||||
::memset(outData, 0x00U, 50U);
|
||||
|
|
@ -1088,7 +1088,7 @@ unsigned long CNXDNKenwoodNetwork::getTimeStamp() const
|
|||
timeStamp += ms * 80U;
|
||||
#else
|
||||
struct timeval tod;
|
||||
::gettimeofday(&tod, NULL);
|
||||
::gettimeofday(&tod, nullptr);
|
||||
|
||||
unsigned int ss = tod.tv_sec;
|
||||
unsigned int ms = tod.tv_usec / 1000U;
|
||||
|
|
@ -1102,7 +1102,7 @@ unsigned long CNXDNKenwoodNetwork::getTimeStamp() const
|
|||
|
||||
bool CNXDNKenwoodNetwork::processKenwoodVoiceLateEntry(unsigned char* inData)
|
||||
{
|
||||
assert(inData != NULL);
|
||||
assert(inData != nullptr);
|
||||
|
||||
unsigned char sacch[4U];
|
||||
sacch[0U] = inData[12U];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue