mirrors/urfd
1
0 Fork 0
mirror of https://github.com/nostar/urfd.git synced 2026-11-08 04:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

it compiles

Browse Source
This commit is contained in:
Tom Early committed 2023-02-19 04:13:58 -07:00
1 parent 991d4899a0
commit ee0664dab7
9 files changed
+22 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

reflector/Callsign.cpp
+3 -12
View File
@@ -38,15 +38,6 @@ CCallsign::CCallsign()
m_coded = 0;
}
CCallsign::CCallsign(const CCallsign &cs)
{
m_Callsign.l = cs.m_Callsign.l;
m_Suffix.u = cs.m_Suffix.u;
m_Module = cs.m_Module;
if (m_Callsign.l)
CSIn();
}
CCallsign::CCallsign(const std::string &cs, uint32_t dmrid, uint16_t nxdnid) : CCallsign()
{
// and populate
@@ -222,7 +213,7 @@ void CCallsign::SetCallsign(const std::string &s, bool updateids)
}
}
void CCallsign::SetCallsign(const uint8_t *buffer, int len, bool UpdateDmrid)
void CCallsign::SetCallsign(const uint8_t *buffer, int len, bool updateids)
{
// set callsign
memset(m_Callsign.c, ' ', CALLSIGN_LEN);
@@ -240,7 +231,7 @@ void CCallsign::SetCallsign(const uint8_t *buffer, int len, bool UpdateDmrid)
m_Module = (char)buffer[CALLSIGN_LEN-1];
}
CSIn();
if ( UpdateDmrid )
if (updateids)
{
auto key = GetKey();
g_LDid.Lock();
@@ -344,7 +335,7 @@ void CCallsign::PatchCallsign(int off, const char *patch, int len)
////////////////////////////////////////////////////////////////////////////////////////
// get
const UCallsign CCallsign::GetKey() const
UCallsign CCallsign::GetKey() const
{
UCallsign rval;
rval.l = 0;
reflector/Callsign.h
+1 -1
View File
@@ -72,7 +72,7 @@ public:
void PatchCallsign(int, const char *, int);
// get
const UCallsign GetKey() const;
UCallsign GetKey() const;
void GetCallsign(uint8_t *) const;
void GetCallsignString(char *) const;
const std::string GetCS() const;
reflector/Lookup.h
+8
View File
@@ -37,6 +37,14 @@ struct CCallsignHash
}
};
struct CCallsignEqual
{
bool operator() (const UCallsign &ucs1, const UCallsign &ucs2) const
{
return ucs1.l == ucs2.l;
}
};
////////////////////////////////////////////////////////////////////////////////////////
reflector/LookupDmr.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ void CLookupDmr::LoadParameters()
m_Url.assign(g_Conf.GetString(g_Keys.dmriddb.url));
}
const uint32_t CLookupDmr::FindDmrid(const UCallsign &ucs) const
uint32_t CLookupDmr::FindDmrid(const UCallsign &ucs) const
{
auto found = m_DmridMap.find(ucs);
if ( found != m_DmridMap.end() )
reflector/LookupDmr.h
+2 -2
View File
@@ -24,7 +24,7 @@ class CLookupDmr : public CLookup
{
public:
~CLookupDmr() {}
const uint32_t FindDmrid(const UCallsign &ucs) const;
uint32_t FindDmrid(const UCallsign &ucs) const;
const UCallsign *FindCallsign(uint32_t dmrid) const;
protected:
@@ -34,5 +34,5 @@ protected:
private:
std::unordered_map<uint32_t, UCallsign> m_CallsignMap;
std::unordered_map<UCallsign, uint32_t, CCallsignHash> m_DmridMap;
std::unordered_map<UCallsign, uint32_t, CCallsignHash, CCallsignEqual> m_DmridMap;
};
reflector/LookupNxdn.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ const UCallsign *CLookupNxdn::FindCallsign(uint16_t nxdnid) const
return nullptr;
}
const uint16_t CLookupNxdn::FindNXDNid(const UCallsign &ucs) const
uint16_t CLookupNxdn::FindNXDNid(const UCallsign &ucs) const
{
auto found = m_NxdnidMap.find(ucs);
if ( found != m_NxdnidMap.end() )
@@ -64,7 +64,7 @@ void CLookupNxdn::UpdateContent(std::stringstream &ss, Eaction action)
{
bool failed = true;
auto l = atol(line.c_str()); // no throw guarantee
if (0 < l && l < 0x10000UL)
if (0 < l && l < 0x10000)
{
auto id = uint32_t(l);
auto p1 = line.find(',');
reflector/LookupNxdn.h
+2 -2
View File
@@ -23,7 +23,7 @@
class CLookupNxdn : public CLookup
{
public:
const uint16_t FindNXDNid(const UCallsign &ucs) const;
uint16_t FindNXDNid(const UCallsign &ucs) const;
const UCallsign *FindCallsign(const uint16_t id) const;
protected:
void ClearContents();
@@ -32,5 +32,5 @@ protected:
private:
std::unordered_map <uint32_t, UCallsign> m_CallsignMap;
std::unordered_map <UCallsign, uint32_t, CCallsignHash> m_NxdnidMap;
std::unordered_map <UCallsign, uint32_t, CCallsignHash, CCallsignEqual> m_NxdnidMap;
};
reflector/LookupYsf.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include "YSFNode.h"
#include "Lookup.h"
using CsNodeMap = std::unordered_map<UCallsign, CYsfNode, CCallsignHash>;
using CsNodeMap = std::unordered_map<UCallsign, CYsfNode, CCallsignHash, CCallsignEqual>;
class CLookupYsf : public CLookup
{
reflector/Main.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
// define the action
case 'p':
if (Eaction::err_only == action)
if (Eaction::error_only == action)
{
std::cerr << "You can't specify both -p and -q!\n";
usage(std::cerr, argv[0]);
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
else
action = Eaction::err_only;
action = Eaction::error_only;
break;
// finally