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

Remove unnecessary double-sprintf() in close_dcc_file()

Browse Source
This commit is contained in:
Kevin Easton
2016-10-19 16:48:28 +11:00
parent b462cf0001
commit e49dfcf11f
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/dcc.c
View File

@@ -1745,27 +1745,27 @@ void dcc_chat(char *command, char *args)
void close_dcc_file(int snum) void close_dcc_file(int snum)
{ {
SocketList *s; SocketList *s;
DCC_int *n; DCC_int *n;
char lame_ultrix[30]; /* should be plenty */ char lame_ultrix[30]; /* should be plenty */
char lame_ultrix2[30]; char lame_ultrix2[30];
char lame_ultrix3[30]; char lame_ultrix3[30];
char buffer[50]; char *tofrom = NULL;
char *tofrom = NULL; char *filename, *p;
char *filename, *p;
#ifdef GUI #ifdef GUI
char *who; char *who;
#endif #endif
double xtime; double xtime;
double xfer; double xfer;
double temp; double temp;
unsigned long type; unsigned long type;
char lame_type[30]; char lame_type[30];
s = get_socket(snum); s = get_socket(snum);
if (!s || !(n = (DCC_int *)s->info)) if (!s || !(n = (DCC_int *)s->info))
return; return;
type = s->flags & DCC_TYPES; type = s->flags & DCC_TYPES;
*lame_type = 0; *lame_type = 0;
if (s->flags & DCC_TDCC) if (s->flags & DCC_TDCC)
@@ -1784,7 +1784,6 @@ char lame_type[30];
/* Cant pass %g to put_it (lame ultrix/dgux), fix suggested by sheik. */ /* Cant pass %g to put_it (lame ultrix/dgux), fix suggested by sheik. */
sprintf(lame_ultrix2, "%2.4g%s", _GMKv(xfer), _GMKs(xfer)); sprintf(lame_ultrix2, "%2.4g%s", _GMKv(xfer), _GMKs(xfer));
sprintf(lame_ultrix3, "%2.4g", xtime); sprintf(lame_ultrix3, "%2.4g", xtime);
sprintf(buffer, "%%s %s %%s %%s TRANSFER COMPLETE", lame_type);
filename = LOCAL_COPY(n->filename); filename = LOCAL_COPY(n->filename);
p = filename; p = filename;
@@ -1804,8 +1803,9 @@ char lame_type[30];
default: default:
tofrom = "to"; tofrom = "to";
} }
set_display_target(NULL, LOG_DCC); set_display_target(NULL, LOG_DCC);
if(do_hook(DCC_LOST_LIST,buffer,s->server, strip_path(n->filename), lame_ultrix)) if (do_hook(DCC_LOST_LIST, "%s %s %s %s TRANSFER COMPLETE", s->server, lame_type, strip_path(n->filename), lame_ultrix))
put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_LOST_FSET), put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_LOST_FSET),
"%s %s %s %s %s %s %s %s", "%s %s %s %s %s %s %s %s",
update_clock(GET_TIME), lame_type, strip_path(filename), update_clock(GET_TIME), lame_type, strip_path(filename),