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

Only declare variable hp in parse_args() when !IPV6

Browse Source 
Squashes an unused variable warning.
This commit is contained in:
Kevin Easton
2017-11-30 00:01:30 +11:00
parent 0905cf9528
commit 7a36be1c47
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/irc.c
View File

@@ -643,7 +643,6 @@ static char *parse_args (char *argv[], int argc, char **envp)
struct passwd *entry; struct passwd *entry;
#endif #endif
char *channel = NULL; char *channel = NULL;
struct hostent * hp;
char *ptr; char *ptr;
*nickname = 0; *nickname = 0;
@@ -1102,17 +1101,25 @@ static char *parse_args (char *argv[], int argc, char **envp)
if (LocalHostName) if (LocalHostName)
{ {
printf("Your hostname appears to be [%s]\n", LocalHostName); printf("Your hostname appears to be [%s]\n", LocalHostName);
}
#ifndef IPV6 #ifndef IPV6
memset((void *)&LocalHostAddr, 0, sizeof(LocalHostAddr)); if (LocalHostName)
{
struct hostent *hp;
memset(&LocalHostAddr, 0, sizeof(LocalHostAddr));
if ((hp = gethostbyname(LocalHostName))) if ((hp = gethostbyname(LocalHostName)))
memcpy((void *)&LocalHostAddr.sf_addr, hp->h_addr, sizeof(struct in_addr)); memcpy((void *)&LocalHostAddr.sf_addr, hp->h_addr, sizeof(struct in_addr));
} }
else else
{ {
struct hostent *hp;
if ((hp = gethostbyname(hostname))) if ((hp = gethostbyname(hostname)))
memcpy((char *) &MyHostAddr.sf_addr, hp->h_addr, sizeof(struct in_addr)); memcpy(&MyHostAddr.sf_addr, hp->h_addr, sizeof(struct in_addr));
#endif
} }
#endif
if (!*nickname) if (!*nickname)
strlcpy(nickname, username, sizeof nickname); strlcpy(nickname, username, sizeof nickname);