philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify function_uptime() and change it to use long instead of time_t.

Browse Source 
This fixes a series of compiler warnings on netbsd i386.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@465 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-11-15 12:55:44 +00:00
parent 70b1c060f3
commit 77ee55f33f
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/functions.c
View File

@@ -3854,7 +3854,7 @@ BUILT_IN_FUNCTION(function_truncate, words)
BUILT_IN_FUNCTION(function_tdiff2, input) BUILT_IN_FUNCTION(function_tdiff2, input)
{ {
time_t ltime; long ltime;
long days, hours, minutes, seconds; long days, hours, minutes, seconds;
char days_str[30], hours_str[6], minutes_str[6], seconds_str[6]; char days_str[30], hours_str[6], minutes_str[6], seconds_str[6];
char result_str[45]; char result_str[45];
@@ -4280,32 +4280,20 @@ BUILT_IN_FUNCTION(function_pass, words)
BUILT_IN_FUNCTION(function_uptime, input) BUILT_IN_FUNCTION(function_uptime, input)
{ {
time_t ltime; long ltime = now - start_time;
time_t days,hours,minutes,seconds; long days, hours, minutes, seconds;
struct timeval tp; char result[45];
static time_t timestart = 0;
time_t timediff;
char buffer[BIG_BUFFER_SIZE+1];
*buffer = '\0';
get_time(&tp);
if (timestart == 0)
{
timestart = tp.tv_sec;
timediff = 0;
} else
timediff = tp.tv_sec - timestart;
ltime = timediff;
seconds = ltime % 60; seconds = ltime % 60;
ltime = (ltime - seconds) / 60; ltime /= 60;
minutes = ltime%60; minutes = ltime % 60;
ltime = (ltime - minutes) / 60; ltime /= 60;
hours = ltime % 24; hours = ltime % 24;
days = (ltime - hours) / 24; days = ltime / 24;
sprintf(buffer, "%ldd %ldh %ldm %lds", days, hours, minutes, seconds);
RETURN_STR(buffer); snprintf(result, sizeof result, "%ldd %ldh %ldm %lds",
days, hours, minutes, seconds);
RETURN_STR(result);
} }
BUILT_IN_FUNCTION(function_cluster, input) BUILT_IN_FUNCTION(function_cluster, input)