Branch merge
This commit is contained in:
commit
9aecf17d4c
|
@ -1002,7 +1002,7 @@ stats_tstats (struct Client *source_p)
|
|||
sp.is_sbr / 1024);
|
||||
sendto_one_numeric(source_p, RPL_STATSDEBUG,
|
||||
"T :time connected %lu %lu",
|
||||
sp.is_cti, sp.is_sti);
|
||||
(long int)sp.is_cti, (long int)sp.is_sti);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -1400,18 +1400,18 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
|
|||
rb_snprintf(buffer, sizeof(buffer),
|
||||
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
|
||||
user, host, reason, oper_reason, current_date,
|
||||
get_oper_name(source_p), rb_current_time());
|
||||
get_oper_name(source_p), (long int)rb_current_time());
|
||||
}
|
||||
else if(type == DLINE_TYPE)
|
||||
{
|
||||
rb_snprintf(buffer, sizeof(buffer),
|
||||
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
|
||||
reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time());
|
||||
reason, oper_reason, current_date, get_oper_name(source_p), (long int)rb_current_time());
|
||||
}
|
||||
else if(type == RESV_TYPE)
|
||||
{
|
||||
rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
|
||||
host, reason, get_oper_name(source_p), rb_current_time());
|
||||
host, reason, get_oper_name(source_p), (long int)rb_current_time());
|
||||
}
|
||||
|
||||
if(fputs(buffer, out) == -1)
|
||||
|
|
|
@ -947,7 +947,7 @@ server_estab(struct Client *client_p)
|
|||
{
|
||||
start_zlib_session(client_p);
|
||||
}
|
||||
sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, rb_current_time());
|
||||
sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time());
|
||||
|
||||
client_p->servptr = &me;
|
||||
|
||||
|
|
Loading…
Reference in New Issue