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

Convert uses of new_malloc/strcpy in end_vote() to m_strdup. While I'm

Browse Source 
here, don't cast what new_malloc returns.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@259 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-07-07 09:28:11 +00:00
parent c76c962feb
commit b1e59bed9e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dll/acro/acro.c
View File

@@ -385,7 +385,7 @@ srec *end_vote(vrec *voters, prec *players, srec *stmp)
prec *tmp2 = NULL; prec *tmp2 = NULL;
srec *tmp3 = NULL, *last; srec *tmp3 = NULL, *last;
if (!stmp && voters && players) if (!stmp && voters && players)
stmp = (srec *)new_malloc(sizeof(srec)); stmp = new_malloc(sizeof(srec));
for (tmp = voters; tmp; tmp = tmp->next) for (tmp = voters; tmp; tmp = tmp->next)
{ {
gotscore = 0; gotscore = 0;
@@ -394,8 +394,7 @@ srec *end_vote(vrec *voters, prec *players, srec *stmp)
tmp2 = tmp2->next; tmp2 = tmp2->next;
if (stmp && !stmp->nick) if (stmp && !stmp->nick)
{ {
stmp->nick = (char *)new_malloc(strlen(tmp2->nick)+1); stmp->nick = m_strdup(tmp2->nick);
strcpy(stmp->nick, tmp2->nick);
stmp->score = 1; stmp->score = 1;
continue; continue;
} }
@@ -411,9 +410,8 @@ srec *end_vote(vrec *voters, prec *players, srec *stmp)
} }
if (!gotscore) if (!gotscore)
{ {
tmp3 = last->next = (srec *)new_malloc(sizeof(srec)); tmp3 = last->next = new_malloc(sizeof(srec));
tmp3->nick = (char *)new_malloc(strlen(tmp2->nick)+1); tmp3->nick = m_strdup(tmp2->nick);
strcpy(tmp3->nick, tmp2->nick);
tmp3->score = 1; tmp3->score = 1;
} }
} }