diff --git a/src/botnet.c b/src/botnet.c index bb6b4aad3..93f2e4eca 100644 --- a/src/botnet.c +++ b/src/botnet.c @@ -341,17 +341,8 @@ void remparty(char *bot, int sock) nfree(party[i].from); if (party[i].away) nfree(party[i].away); - if (i < parties) { - strcpy(party[i].bot, party[parties].bot); - strcpy(party[i].nick, party[parties].nick); - party[i].chan = party[parties].chan; - party[i].sock = party[parties].sock; - party[i].flag = party[parties].flag; - party[i].status = party[parties].status; - party[i].timer = party[parties].timer; - party[i].from = party[parties].from; - party[i].away = party[parties].away; - } + if (i < parties) + party[i] = party[parties]; } } diff --git a/src/dccutil.c b/src/dccutil.c index 24cb43cfd..89832fb41 100644 --- a/src/dccutil.c +++ b/src/dccutil.c @@ -364,7 +364,7 @@ void removedcc(int n) nfree(dcc[n].u.other); dcc_total--; if (n < dcc_total) - memcpy(&dcc[n], &dcc[dcc_total], sizeof(struct dcc_t)); + dcc[n] = dcc[dcc_total]; else egg_bzero(&dcc[n], sizeof(struct dcc_t)); /* drummer */ }