SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use difftime to do time_t math 

This avoid any assumptions of what the underlying time_t type is.
This commit is contained in:
alok 2013-12-12 23:15:26 -05:00
parent 19e07776a6
commit d01ecd8cea
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
push.cpp
View File

@ -692,10 +692,9 @@ class CPushMod : public CModule
*/ */
bool idle() bool idle()
{ {
int value = options["idle"].ToInt(); unsigned int value = options["idle"].ToUInt();
time_t now = time(NULL); time_t now = time(NULL);
return value <= 0 return value == 0 || difftime(now, idle_time) >= value;
|| idle_time + value < now;
} }
/** /**
@ -706,11 +705,11 @@ class CPushMod : public CModule
*/ */
bool last_active(const CString& context) bool last_active(const CString& context)
{ {
int value = options["last_active"].ToInt(); unsigned int value = options["last_active"].ToUInt();
time_t now = time(NULL); time_t now = time(NULL);
return value <= 0 return value == 0
|| last_active_time.count(context) < 1 || last_active_time.count(context) < 1
|| last_active_time[context] + value < now; || difftime(now, last_active_time[context]) >= value;
} }
/** /**
@ -721,11 +720,11 @@ class CPushMod : public CModule
*/ */
bool last_notification(const CString& context) bool last_notification(const CString& context)
{ {
int value = options["last_notification"].ToInt(); unsigned int value = options["last_notification"].ToUInt();
time_t now = time(NULL); time_t now = time(NULL);
return value <= 0 return value == 0
|| last_notification_time.count(context) < 1 || last_notification_time.count(context) < 1
|| last_notification_time[context] + value < now; || difftime(now, last_notification_time[context]) >= value;
} }
/** /**