diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2001-10-26 12:06:38 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2001-10-26 12:06:38 +0000 |
| commit | 6d798f67001b480d2fc031fc858634e9dc3fe159 (patch) | |
| tree | ffa695a75dc096df9ca4801189099a73fd6f7656 | |
| parent | f1a55ddaa932520e637207973320f4e96b709131 (diff) | |
| download | zsh-6d798f67001b480d2fc031fc858634e9dc3fe159.tar.gz zsh-6d798f67001b480d2fc031fc858634e9dc3fe159.tar.xz zsh-6d798f67001b480d2fc031fc858634e9dc3fe159.zip | |
16172: freehostent -> zfreehostent to avoid name clash
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Modules/tcp.c | 2 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 4e7b29ec1..20143403c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-10-26 Peter Stephenson <pws@csr.com> + * 16172: Src/Modules/tcp.c, Src/Modules/zftp.c: rename + freehostent() to zfreehostent() to avoid clash with Solaris libnsl. + * 16171: Doc/Zsh/zftpsys.yo: minor changes of phrasing. * 15793: Src/Modules/zftp.c: require zsh/net/tcp explicitly from diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index 23c86053b..1fe813e3f 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -194,7 +194,7 @@ zsh_getipnodebyname(char const *name, int af, int flags, int *errorp) /**/ mod_export void -freehostent(struct hostent *ptr) +zfreehostent(struct hostent *ptr) { } diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 39df87fd7..8dda5f1a8 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -1793,7 +1793,7 @@ zftp_open(char *name, char **args, int flags) tcp_close(zfsess->control); zfsess->control = NULL; } - freehostent(zhostp); + zfreehostent(zhostp); zfunsetparam("ZFTP_HOST"); FAILED(); zwarnnam(name, "socket failed: %e", NULL, errno); @@ -1821,7 +1821,7 @@ zftp_open(char *name, char **args, int flags) } if (err) { - freehostent(zhostp); + zfreehostent(zhostp); zfclose(0); FAILED(); zwarnnam(name, "connect failed: %e", NULL, errno); @@ -1842,7 +1842,7 @@ zftp_open(char *name, char **args, int flags) zsh_inet_ntop(af, *addrp, pbuf, sizeof(pbuf)); zfsetparam("ZFTP_IP", ztrdup(pbuf), ZFPM_READONLY); } - freehostent(zhostp); + zfreehostent(zhostp); /* now we can talk to the control connection */ zcfinish = 0; |