Add REMOVE_CALLSIGN_SUFFIX

pull/149/head
Geoffrey Merck 6 years ago committed by GitHub
parent f65132f596
commit 2b88523f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -76,7 +76,9 @@ CCallsign::CCallsign(const char *sz, uint32 dmrid)
if ( callsign != NULL )
{
::memcpy(m_Callsign, callsign->m_Callsign, sizeof(m_Callsign));
#if (REMOVE_CALLSIGN_SUFFIX == 1)
::memcpy(m_Suffix, callsign->m_Suffix, sizeof(m_Suffix));
#endif
}
}
g_DmridDir.Unlock();
@ -86,7 +88,11 @@ CCallsign::CCallsign(const char *sz, uint32 dmrid)
CCallsign::CCallsign(const CCallsign &callsign)
{
::memcpy(m_Callsign, callsign.m_Callsign, sizeof(m_Callsign));
#if (REMOVE_CALLSIGN_SUFFIX == 1)
::memset(m_Suffix, ' ', sizeof(m_Suffix));
#else
::memcpy(m_Suffix, callsign.m_Suffix, sizeof(m_Suffix));
#endif
m_Module = callsign.m_Module;
m_uiDmrid = callsign.m_uiDmrid;
}
@ -230,14 +236,18 @@ void CCallsign::SetModule(char c)
void CCallsign::SetSuffix(const char *sz)
{
::memset(m_Suffix, ' ', sizeof(m_Suffix));
#if (REMOVE_CALLSIGN_SUFFIX == 1)
::memcpy(m_Suffix, sz, MIN(strlen(sz), sizeof(m_Suffix)));
#endif
}
void CCallsign::SetSuffix(const uint8 *buffer, int len)
{
len = MIN(len, sizeof(m_Suffix));
::memset(m_Suffix, ' ', sizeof(m_Suffix));
#if (REMOVE_CALLSIGN_SUFFIX == 0)
len = MIN(len, sizeof(m_Suffix));
::memcpy(m_Suffix, buffer, len);
#endif
}
////////////////////////////////////////////////////////////////////////////////////////

Loading…
Cancel
Save

Powered by TurnKey Linux.