shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-13 13:17:36 +03:00
Code

cleanup patches from Peter Breitenlohner Daniel

Browse Source 
* nanoftp.c nanohttp.c: cleanup patches from Peter Breitenlohner
Daniel
This commit is contained in:
Daniel Veillard 2003-07-10 14:04:33 +00:00
parent df101d832d
commit 3dc93a4243
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Jul 10 16:02:47 CEST 2003 Daniel Veillard <daniel@veillard.com>
* nanoftp.c nanohttp.c: cleanup patches from Peter Breitenlohner
Tue Jul 8 16:02:19 CEST 2003 Daniel Veillard <daniel@veillard.com>
* globals.c threads.c: fixes some problem when freeing unititialized

7
nanoftp.c
View File

@ -1044,7 +1044,12 @@ xmlNanoFTPConnect(void *ctx) {
if (tmp->ai_family == AF_INET || tmp->ai_family == AF_INET6)
break;
if (tmp) {
if (!tmp) {
if (result)
freeaddrinfo (result);
return (-1);
}
else {
if (tmp->ai_family == AF_INET6) {
memcpy (&ctxt->ftpAddr, tmp->ai_addr, tmp->ai_addrlen);
((struct sockaddr_in6 *) &ctxt->ftpAddr)->sin6_port = htons (port);

12
nanohttp.c
View File

@ -996,14 +996,13 @@ xmlNanoHTTPConnectHost(const char *host, int port)
}
for (res = result; res; res = res->ai_next) {
if (res) {
if (res->ai_family == AF_INET || res->ai_family == AF_INET6) {
if (res->ai_family == AF_INET6) {
memcpy (&sockin6, res->ai_addr, res->ai_addrlen);
sockin6.sin6_port = htons (port);
addr = (struct sockaddr *)&sockin6;
}
if (res->ai_family == AF_INET) {
else {
memcpy (&sockin, res->ai_addr, res->ai_addrlen);
sockin.sin_port = htons (port);
addr = (struct sockaddr *)&sockin;
@ -1015,11 +1014,10 @@ xmlNanoHTTPConnectHost(const char *host, int port)
return (s);
}
}
else {
freeaddrinfo (result);
return (-1);
}
}
if (result)
freeaddrinfo (result);
return (-1);
} else
#endif
#endif