adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 09:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use gettimeofday instead of clock_gettime.

Browse Source 
POSIX.1-2008 deprecates gettimeofday...
So perhaps it will be changed back in future.

For now gettimeofday is more portable :(
This commit is contained in:
Alexey Sokolov
2012-08-09 00:37:16 +07:00
parent 54f558a4ee
commit d37cb447a0
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Buffer.cpp
+6 -7
View File
@@ -11,7 +11,7 @@
#include <znc/Client.h>
#include <znc/User.h>
CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timespec* ts) {
CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) {
m_sFormat = sFormat;
m_sText = sText;
if (ts == NULL)
@@ -23,13 +23,11 @@ CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timespec*
CBufLine::~CBufLine() {}
void CBufLine::UpdateTime() {
#if _POSIX_TIMERS
if (0 == clock_gettime(CLOCK_REALTIME, &m_time)) {
if (0 == gettimeofday(&m_time, NULL)) {
return;
}
#endif
time(&m_time.tv_sec);
m_time.tv_nsec = 0;
m_time.tv_usec = 0;
}
CString CBufLine::GetLine(const CClient& Client, const MCString& msParams) const {
@@ -38,10 +36,11 @@ CString CBufLine::GetLine(const CClient& Client, const MCString& msParams) const
if (Client.HasServerTime()) {
msThisParams["text"] = m_sText;
CString sStr = CString::NamedFormat(m_sFormat, msThisParams);
CString s_msec(m_time.tv_nsec / 1000000);
CString s_msec(m_time.tv_usec / 1000);
while (s_msec.length() < 3) {
s_msec = "0" + s_msec;
}
// TODO support message-tags properly
return "@time=" + CString(m_time.tv_sec) + "." + s_msec + " " + sStr;
} else {
msThisParams["text"] = Client.GetUser()->AddTimestamp(m_time.tv_sec, m_sText);
@@ -55,7 +54,7 @@ CBuffer::CBuffer(unsigned int uLineCount) {
CBuffer::~CBuffer() {}
int CBuffer::AddLine(const CString& sFormat, const CString& sText, const timespec* ts) {
int CBuffer::AddLine(const CString& sFormat, const CString& sText, const timeval* ts) {
if (!m_uLineCount) {
return 0;
}
src/Client.cpp
+5
View File
@@ -85,6 +85,11 @@ void CClient::ReadLine(const CString& sData) {
DEBUG("(" << GetFullName() << ") CLI -> ZNC [" << sLine << "]");
if (sLine.Left(1) == "@") {
// TODO support message-tags properly
sLine = sLine.Token(1, true);
}
if (IsAttached()) {
NETWORKMODULECALL(OnUserRaw(sLine), m_pUser, m_pNetwork, this, return);
} else {