diff --git a/reflector/BlackWhiteSet.h b/reflector/BlackWhiteSet.h index 3ec0421..5b2797e 100644 --- a/reflector/BlackWhiteSet.h +++ b/reflector/BlackWhiteSet.h @@ -42,7 +42,7 @@ public: bool ReloadFromFile(void); bool NeedReload(void); - // pass-thru + // pass-through bool empty() const { return m_Callsigns.empty(); } // compare diff --git a/reflector/Callsign.h b/reflector/Callsign.h index 4ad3c29..99ca10c 100644 --- a/reflector/Callsign.h +++ b/reflector/Callsign.h @@ -63,7 +63,7 @@ struct CCallsignEqual class CCallsign { public: - // contructors + // constructors CCallsign(); CCallsign(const UCallsign &cs); // no id lookup CCallsign(const CCallsign &cs); diff --git a/reflector/Clients.cpp b/reflector/Clients.cpp index fcddd63..4e0bca4 100644 --- a/reflector/Clients.cpp +++ b/reflector/Clients.cpp @@ -73,7 +73,7 @@ void CClients::RemoveClient(std::shared_ptr client) bool found = false; for ( auto it=begin(); it!=end(); it++ ) { - // compare objetc pointers + // compare object pointers if ( *it == client ) { // found it ! diff --git a/reflector/Clients.h b/reflector/Clients.h index e596076..322c3ef 100644 --- a/reflector/Clients.h +++ b/reflector/Clients.h @@ -47,7 +47,7 @@ public: void RemoveClient(std::shared_ptr); bool IsClient(std::shared_ptr) const; - // pass-thru + // pass-through std::list>::iterator begin() { return m_Clients.begin(); } std::list>::iterator end() { return m_Clients.end(); } std::list>::const_iterator cbegin() const { return m_Clients.cbegin(); } diff --git a/reflector/CodecStream.h b/reflector/CodecStream.h index 74db476..1576f1d 100644 --- a/reflector/CodecStream.h +++ b/reflector/CodecStream.h @@ -50,7 +50,7 @@ public: void Thread(void); void Task(void); - // pass-thru + // pass-through void Push(std::unique_ptr p) { m_Queue.Push(std::move(p)); } protected: diff --git a/reflector/Configure.cpp b/reflector/Configure.cpp index 9736b50..21b837e 100644 --- a/reflector/Configure.cpp +++ b/reflector/Configure.cpp @@ -493,7 +493,7 @@ bool CConfigure::ReadData(const std::string &path) badParam(key); break; default: - std::cout << "WARNING: parameter '" << line << "' defined befor any [section]" << std::endl; + std::cout << "WARNING: parameter '" << line << "' defined before any [section]" << std::endl; } } @@ -536,7 +536,7 @@ bool CConfigure::ReadData(const std::string &path) } else { - std::cerr << "ERROR: specifed IPv4 external address, " << v4 << ", is malformed" << std::endl; + std::cerr << "ERROR: specified IPv4 external address, " << v4 << ", is malformed" << std::endl; rval = true; } } @@ -574,7 +574,7 @@ bool CConfigure::ReadData(const std::string &path) } else { - std::cerr << "ERROR: the specifed IPv6 address [" << v6 << "] is malformed" << std::endl; + std::cerr << "ERROR: the specified IPv6 address [" << v6 << "] is malformed" << std::endl; rval = true; } } diff --git a/reflector/DMRPlusProtocol.cpp b/reflector/DMRPlusProtocol.cpp index 4de295f..fefc957 100644 --- a/reflector/DMRPlusProtocol.cpp +++ b/reflector/DMRPlusProtocol.cpp @@ -449,7 +449,7 @@ bool CDmrplusProtocol::IsValidDvFramePacket(const CIp &Ip, const CBuffer &Buffer uint8_t dmrsync[7]; // get the 33 bytes ambe memcpy(dmrframe, &(Buffer.data()[26]), 33); - // handle endianess + // handle endianness SwapEndianess(dmrframe, sizeof(dmrframe)); // extract the 3 ambe frames memcpy(dmr3ambe, dmrframe, 14); diff --git a/reflector/G3Protocol.cpp b/reflector/G3Protocol.cpp index 7c15ca8..8d5e24b 100644 --- a/reflector/G3Protocol.cpp +++ b/reflector/G3Protocol.cpp @@ -390,7 +390,7 @@ void CG3Protocol::Task(void) { BaseIp = &ClIp; client->Alive(); - // supress host checks - no ping needed to trigger potential ICMPs + // suppress host checks - no ping needed to trigger potential ICMPs // the regular data flow will do it m_LastKeepaliveTime.start(); break; @@ -444,7 +444,7 @@ void CG3Protocol::HandleQueue(void) { while (! m_Queue.IsEmpty()) { - // supress host checks + // suppress host checks m_LastKeepaliveTime.start(); // get the packet diff --git a/reflector/Golay2087.cpp b/reflector/Golay2087.cpp index 3e34543..c43e660 100644 --- a/reflector/Golay2087.cpp +++ b/reflector/Golay2087.cpp @@ -219,7 +219,7 @@ unsigned int CGolay2087::getSyndrome1987(unsigned int pattern) * Compute the syndrome corresponding to the given pattern, i.e., the * remainder after dividing the pattern (when considering it as the vector * representation of a polynomial) by the generator polynomial, GENPOL. - * In the program this pattern has several meanings: (1) pattern = infomation + * In the program this pattern has several meanings: (1) pattern = information * bits, when constructing the encoding table; (2) pattern = error pattern, * when constructing the decoding table; and (3) pattern = received vector, to * obtain its syndrome in decoding. diff --git a/reflector/Golay24128.cpp b/reflector/Golay24128.cpp index 6f810e6..fc1ed18 100644 --- a/reflector/Golay24128.cpp +++ b/reflector/Golay24128.cpp @@ -1055,7 +1055,7 @@ static unsigned int get_syndrome_23127(unsigned int pattern) * Compute the syndrome corresponding to the given pattern, i.e., the * remainder after dividing the pattern (when considering it as the vector * representation of a polynomial) by the generator polynomial, GENPOL. - * In the program this pattern has several meanings: (1) pattern = infomation + * In the program this pattern has several meanings: (1) pattern = information * bits, when constructing the encoding table; (2) pattern = error pattern, * when constructing the decoding table; and (3) pattern = received vector, to * obtain its syndrome in decoding. diff --git a/reflector/Hamming.cpp b/reflector/Hamming.cpp index 42636f0..1980a1f 100644 --- a/reflector/Hamming.cpp +++ b/reflector/Hamming.cpp @@ -224,7 +224,7 @@ bool CHamming::decode1393(bool* d) d[12] = !d[12]; return true; - // Data bit erros + // Data bit errors case 0x0FU: d[0] = !d[0]; return true; @@ -303,7 +303,7 @@ bool CHamming::decode1063(bool* d) d[9] = !d[9]; return true; - // Data bit erros + // Data bit errors case 0x07U: d[0] = !d[0]; return true; diff --git a/reflector/InterlinkMap.h b/reflector/InterlinkMap.h index afa73c2..3e78650 100644 --- a/reflector/InterlinkMap.h +++ b/reflector/InterlinkMap.h @@ -56,7 +56,7 @@ public: bool IsCallsignListed(const std::string &, const char) const; bool IsCallsignListed(const std::string &, const CIp &ip, const char*) const; - // pass-thru + // pass-through bool empty() const { return m_InterlinkMap.empty(); } std::map::iterator begin() { return m_InterlinkMap.begin(); } std::map::iterator end() { return m_InterlinkMap.end(); } diff --git a/reflector/M17CRC.cpp b/reflector/M17CRC.cpp index 6e4587a..fa46504 100644 --- a/reflector/M17CRC.cpp +++ b/reflector/M17CRC.cpp @@ -29,7 +29,7 @@ * Description * ----------- * The source file contains routines which calculate the CCITT CRC - * values for an incomming byte string. + * values for an incoming byte string. */ #include diff --git a/reflector/M17CRC.h b/reflector/M17CRC.h index c6113fb..adc3d9c 100644 --- a/reflector/M17CRC.h +++ b/reflector/M17CRC.h @@ -29,7 +29,7 @@ * Description * ----------- * The source file contains routines which calculate the CCITT CRC - * values for an incomming byte string. + * values for an incoming byte string. */ #pragma once diff --git a/reflector/Main.cpp b/reflector/Main.cpp index 098d35a..1bbd0d6 100644 --- a/reflector/Main.cpp +++ b/reflector/Main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { if (argc != 2) { - std::cerr << "No configuration file specifed! Usage: " << argv[0] << " /pathname/to/configuration/file" << std::endl; + std::cerr << "No configuration file specified! Usage: " << argv[0] << " /pathname/to/configuration/file" << std::endl; return EXIT_FAILURE; } @@ -98,13 +98,13 @@ static void usage(std::ostream &os, const char *name) " ysf : The Callsign => Tx/Rx frequency database.\n" "SOURCE (choose one)\n" " file : The file specified by the FilePath ini parameter.\n" - " http : The URL specified by the URL ini paramater.\n" + " http : The URL specified by the URL ini parameter.\n" "ACTION (choose one)\n" " print : Print all lines from the SOURCE that are syntactically correct.\n" " error : Print only the lines with failed syntax.\n" "INIFILE : an error-free urfd ini file (check it first with inicheck).\n\n" "Only the first character of DATABASE, SOURCE and ACTION is read.\n" - "Example: " << name << " y f e urfd.ini # Check your YSF Tx/Rx database file specifed in urfd.ini for syntax errors.\n\n"; + "Example: " << name << " y f e urfd.ini # Check your YSF Tx/Rx database file specified in urfd.ini for syntax errors.\n\n"; } enum class Edb { none, dmr, nxdn, ysf }; diff --git a/reflector/Packet.cpp b/reflector/Packet.cpp index ed4d3a1..2700369 100644 --- a/reflector/Packet.cpp +++ b/reflector/Packet.cpp @@ -88,7 +88,7 @@ void CPacket::EncodeInterlinkPacket(const char *magic, CBuffer &buf) const data[19] = m_uiYsfPacketFrameId; } -// dstar contstructor +// dstar constructor CPacket::CPacket(uint16_t sid, uint8_t dstarpid) { m_uiStreamId = sid; diff --git a/reflector/Peer.h b/reflector/Peer.h index 89c96d0..4565493 100644 --- a/reflector/Peer.h +++ b/reflector/Peer.h @@ -61,7 +61,7 @@ public: int GetNbClients(void) const { return (int)m_Clients.size(); } void ClearClients(void) { m_Clients.clear(); } - // pass-thru + // pass-through std::list>::iterator begin() { return m_Clients.begin(); } std::list>::iterator end() { return m_Clients.end(); } std::list>::const_iterator cbegin() const { return m_Clients.cbegin(); } diff --git a/reflector/Peers.h b/reflector/Peers.h index 99512ca..81ff5fd 100644 --- a/reflector/Peers.h +++ b/reflector/Peers.h @@ -38,7 +38,7 @@ public: void AddPeer(std::shared_ptr); void RemovePeer(std::shared_ptr); - // pass-thru + // pass-through std::list>::iterator begin() { return m_Peers.begin(); } std::list>::iterator end() { return m_Peers.end(); } std::list>::const_iterator cbegin() const { return m_Peers.cbegin(); } diff --git a/reflector/Protocols.h b/reflector/Protocols.h index 32bbf1e..8de96ee 100644 --- a/reflector/Protocols.h +++ b/reflector/Protocols.h @@ -32,7 +32,7 @@ public: void Lock(void) { m_Mutex.lock(); } void Unlock(void) { m_Mutex.unlock(); } - // pass-thru + // pass-through std::list>::iterator begin() { return m_Protocols.begin(); } std::list>::iterator end() { return m_Protocols.end(); } diff --git a/reflector/QR1676.cpp b/reflector/QR1676.cpp index fe76c90..8f67a2f 100644 --- a/reflector/QR1676.cpp +++ b/reflector/QR1676.cpp @@ -72,7 +72,7 @@ unsigned int CQR1676::getSyndrome1576(unsigned int pattern) * Compute the syndrome corresponding to the given pattern, i.e., the * remainder after dividing the pattern (when considering it as the vector * representation of a polynomial) by the generator polynomial, GENPOL. - * In the program this pattern has several meanings: (1) pattern = infomation + * In the program this pattern has several meanings: (1) pattern = information * bits, when constructing the encoding table; (2) pattern = error pattern, * when constructing the decoding table; and (3) pattern = received vector, to * obtain its syndrome in decoding. diff --git a/reflector/Reflector.cpp b/reflector/Reflector.cpp index 8c9a1c8..7b240db 100644 --- a/reflector/Reflector.cpp +++ b/reflector/Reflector.cpp @@ -182,7 +182,7 @@ bool CReflector::IsStreaming(char module) return false; } -// clients MUST have bee locked by the caller so we can freely access it within the fuction +// clients MUST have bee locked by the caller so we can freely access it within the function std::shared_ptr CReflector::OpenStream(std::unique_ptr &DvHeader, std::shared_ptrclient) { // check sid is not zero @@ -655,7 +655,7 @@ void CReflector::PutDHTConfig() void CReflector::GetDHTConfig(const std::string &cs) { static SUrfdConfig0 cfg; - cfg.timestamp = 0; // everytime this is called, zero the timestamp + cfg.timestamp = 0; // every time this is called, zero the timestamp auto item = g_GateKeeper.GetInterlinkMap()->FindMapItem(cs); g_GateKeeper.ReleaseInterlinkMap(); if (nullptr == item) diff --git a/reflector/SafePacketQueue.h b/reflector/SafePacketQueue.h index fd51b40..5b5ec60 100644 --- a/reflector/SafePacketQueue.h +++ b/reflector/SafePacketQueue.h @@ -22,7 +22,7 @@ /************************************************************ * THIS IS IMPORTANT - * This template is primarly designed for std::unique_ptr! + * This template is primarily designed for std::unique_ptr! * If you are going to use it for std::shared_ptr, then * please consider that when you Push(), what you pushed * from will be nullptr after the Push()! @@ -56,13 +56,13 @@ public: } } - // If the queue is empty, wait until an element is avaiable. + // If the queue is empty, wait until an element is available. T PopWait(void) { std::unique_lock lock(m); while(q.empty()) { - // release lock as long as the wait and reaquire it afterwards. + // release lock as long as the wait and reacquire it afterwards. c.wait(lock); } T val = std::move(q.front()); diff --git a/reflector/UDPSocket.cpp b/reflector/UDPSocket.cpp index 1b078b6..45774ab 100644 --- a/reflector/UDPSocket.cpp +++ b/reflector/UDPSocket.cpp @@ -40,7 +40,7 @@ CUdpSocket::~CUdpSocket() // returns true on error bool CUdpSocket::Open(const CIp &Ip) { - // check for a vaild family + // check for a valid family if (AF_UNSPEC == Ip.GetFamily()) return true; diff --git a/reflector/Users.h b/reflector/Users.h index 85061bf..da8a680 100644 --- a/reflector/Users.h +++ b/reflector/Users.h @@ -40,7 +40,7 @@ public: int GetSize(void) const { return (int)m_Users.size(); } void AddUser(const CUser &); - // pass-thru + // pass-through std::list::iterator begin() { return m_Users.begin(); } std::list::iterator end() { return m_Users.end(); } std::list::const_iterator cbegin() { return m_Users.cbegin(); } diff --git a/reflector/Version.h b/reflector/Version.h index 84aa8d4..ef04078 100644 --- a/reflector/Version.h +++ b/reflector/Version.h @@ -38,7 +38,7 @@ public: // set void Set(uint8_t, uint8_t, uint8_t); - // comparaison operators + // comparison operators bool operator ==(const CVersion &v) const; bool operator !=(const CVersion &v) const; bool operator >=(const CVersion &v) const;