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

Change function_tdiff2() to use long instead of time_t, which fixes warnings on netbsd i386.

Browse Source 
Also rework function to use snprintf() instead of sprintf().


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

62
source/functions.c
View File

@@ -1252,7 +1252,7 @@ static char *alias_server_version (void)
#define GET_INT_ARG(x, y) {RETURN_IF_EMPTY(y); x = atol(safe_new_next_arg(y, &y));} #define GET_INT_ARG(x, y) {RETURN_IF_EMPTY(y); x = atol(safe_new_next_arg(y, &y));}
#define GET_FLOAT_ARG(x, y) {RETURN_IF_EMPTY(y); x = atof(safe_new_next_arg(y, &y));} #define GET_FLOAT_ARG(x, y) {RETURN_IF_EMPTY(y); x = atof(safe_new_next_arg(y, &y));}
#define GET_STR_ARG(x, y) {RETURN_IF_EMPTY(y); x = new_next_arg(y, &y);RETURN_IF_EMPTY(x);} #define GET_STR_ARG(x, y) {RETURN_IF_EMPTY(y); x = new_next_arg(y, &y);RETURN_IF_EMPTY(x);}
#define RETURN_STR(x) return m_strdup(x ? x : EMPTY) #define RETURN_STR(x) return m_strdup((x) ? (x) : EMPTY)
#define RETURN_MSTR(x) return ((x) ? (x) : EMPTY_STRING); #define RETURN_MSTR(x) return ((x) ? (x) : EMPTY_STRING);
#define RETURN_INT(x) return m_strdup(ltoa(x)) #define RETURN_INT(x) return m_strdup(ltoa(x))
@@ -3855,47 +3855,43 @@ BUILT_IN_FUNCTION(function_truncate, words)
BUILT_IN_FUNCTION(function_tdiff2, input) BUILT_IN_FUNCTION(function_tdiff2, input)
{ {
time_t ltime; time_t ltime;
time_t days, long days, hours, minutes, seconds;
hours, char days_str[30], hours_str[6], minutes_str[6], seconds_str[6];
minutes, char result_str[45];
seconds;
char tmp[80];
char *tstr;
GET_INT_ARG(ltime, input); GET_INT_ARG(ltime, input);
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;
tstr = tmp;
if (days) if (days)
{ snprintf(days_str, sizeof days_str, " %ldd", days);
sprintf(tstr, "%ldd ", days);
tstr += strlen(tstr);
}
if (hours)
{
sprintf(tstr, "%ldh ", hours);
tstr += strlen(tstr);
}
if (minutes)
{
sprintf(tstr, "%ldm ", minutes);
tstr += strlen(tstr);
}
if (seconds || (!days && !hours && !minutes))
{
sprintf(tstr, "%lds", seconds);
tstr += strlen(tstr);
}
else else
*--tstr = 0; /* chop off that space! */ days_str[0] = 0;
RETURN_STR(tmp); if (hours)
snprintf(hours_str, sizeof hours_str, " %ldh", hours);
else
hours_str[0] = 0;
if (minutes)
snprintf(minutes_str, sizeof minutes_str, " %ldm", minutes);
else
minutes_str[0] = 0;
if (seconds || (!days && !hours && !minutes))
snprintf(seconds_str, sizeof seconds_str, " %lds", seconds);
else
seconds_str[0] = 0;
snprintf(result_str, sizeof result_str, "%s%s%s%s",
days_str, hours_str, minutes_str, seconds_str);
RETURN_STR(result_str + 1);
} }