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

dcc.c: Fix mismatching format strings in get_dcc_info() and dcc_ftpcommand().

Browse Source 
Cast time_t value to long and use %ld to print.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@469 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-11-16 00:18:39 +00:00
parent 021812f6ae
commit 55d3b28060
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/dcc.c
View File

@@ -3948,7 +3948,7 @@ SocketList *s;
bitchsay("FTP data connection failed.");
}
else if (!my_strnicmp(command, "more", 3))
dcc_printf(s->is_read, "stat %s\n", (args && *args) ? "cwd" : "pwd", (args && *args) ?args:empty_string);
dcc_printf(s->is_read, "stat %s\n", args ? args : empty_string);
else if (!my_strnicmp(command, "cd", 2))
dcc_printf(s->is_read, "%s%s%s\n", (args && *args) ? "cwd" : "pwd", (args && *args) ? space:empty_string, (args && *args) ?args:empty_string);
else if (!my_strnicmp(command, "get",3) && args && *args)
@@ -4254,14 +4254,15 @@ char local_type[80];
if (s->flags & DCC_TDCC)
strcpy(local_type, "T");
strcat(local_type, dcc_types[s->flags & DCC_TYPES]->name);
return m_sprintf("%s %s %s %lu %lu %lu %lu %s #%d %d",
return m_sprintf("%s %s %s %ld %lu %lu %lu %s #%d %d",
local_type, s->server,
s->flags & DCC_OFFER ? "Offer":
s->flags & DCC_WAIT ? "Wait":
s->flags & DCC_ACTIVE? "Active":"Unknown",
n->starttime.tv_sec, n->transfer_orders.byteoffset,
n->bytes_sent, n->bytes_read, n->filename, i,
n->server);
(long)n->starttime.tv_sec,
(unsigned long)n->transfer_orders.byteoffset,
(unsigned long)n->bytes_sent, (unsigned long)n->bytes_read,
n->filename, i, n->server);
}
void dcc_raw_transmit (char *user, char *text, char *type)