generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more explicit casts and remove dead code

Browse Source 
Comment unused SERVER from DeviceShutdown.
Comment unused max from parse_hostport.
Comment unused nodeptr from ixmlNode_cloneDoc.
Comment unused newNode from Parser_hasDefaultNamespace.
Comment unused Parser_parseReference function
Check return code of shutdown and display an error if needed.
This commit is contained in:
Fabrice Fontaine
2012-03-15 14:49:26 +01:00
parent c9f3e26f24
commit cb07623dde
13 changed files with 159 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
upnp/src/genlib/net/http/httpreadwrite.c
View File

@@ -220,6 +220,7 @@ SOCKET http_Connect(
SOCKET connfd;
socklen_t sockaddr_len;
int ret_connect;
char errorBuffer[ERROR_BUFFER_LEN];
http_FixUrl(destination_url, url);
@@ -237,7 +238,11 @@ SOCKET http_Connect(
UpnpPrintf(UPNP_CRITICAL, HTTP, __FILE__, __LINE__,
"connect error: %d\n", WSAGetLastError());
#endif
shutdown(connfd, SD_BOTH);
if (shutdown(connfd, SD_BOTH) == -1) {
strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
"Error in shutdown: %s\n", errorBuffer);
}
UpnpCloseSocket(connfd);
return (SOCKET)(UPNP_E_SOCKET_CONNECT);
}
@@ -1659,7 +1664,7 @@ int http_MakeMessage(membuffer *buf, int http_major_version,
/* mem buffer */
s = (char *)va_arg(argp, char *);
UpnpPrintf(UPNP_ALL, HTTP, __FILE__, __LINE__,
"Adding a char Buffer starting with: %c\n", s[0]);
"Adding a char Buffer starting with: %c\n", (int)s[0]);
assert(s);
length = (size_t) va_arg(argp, size_t);
if (membuffer_append(buf, s, length))