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

Remove more implicit casts in upnp part

Browse Source 
Remove more "implicit integer or enum conversions" as well as memset
before snprintf.
This commit is contained in:
Fabrice Fontaine
2012-03-10 21:27:55 +01:00
parent db532afb9b
commit 2eb3e069ba
11 changed files with 119 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,8 +76,8 @@
const int CHUNK_HEADER_SIZE = 10;
const int CHUNK_TAIL_SIZE = 10;
*/
#define CHUNK_HEADER_SIZE 10
#define CHUNK_TAIL_SIZE 10
#define CHUNK_HEADER_SIZE (size_t)10
#define CHUNK_TAIL_SIZE (size_t)10
#ifndef UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS
@@ -277,7 +277,7 @@ int http_RecvMessage(
int ok_on_close = FALSE;
char buf[2 * 1024];
if (request_method == HTTPMETHOD_UNKNOWN) {
if (request_method == (http_method_t)HTTPMETHOD_UNKNOWN) {
parser_request_init(parser);
} else {
parser_response_init(parser, request_method);
@@ -288,12 +288,13 @@ int http_RecvMessage(
if (num_read > 0) {
/* got data */
status = parser_append(parser, buf, (size_t)num_read);
if (status == PARSE_SUCCESS) {
switch (status) {
case PARSE_SUCCESS:
UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
"<<< (RECVD) <<<\n%s\n-----------------\n",
parser->msg.msg.buf );
print_http_headers( &parser->msg );
if (g_maxContentLength > 0 && parser->content_length > (unsigned int)g_maxContentLength) {
if (g_maxContentLength > (size_t)0 && parser->content_length > (unsigned int)g_maxContentLength) {
*http_error_code = HTTP_REQ_ENTITY_TOO_LARGE;
line = __LINE__;
ret = UPNP_E_OUTOF_BOUNDS;
@@ -302,19 +303,21 @@ int http_RecvMessage(
line = __LINE__;
ret = 0;
goto ExitFunction;
} else if (status == PARSE_FAILURE) {
case PARSE_FAILURE:
*http_error_code = parser->http_error_code;
line = __LINE__;
ret = UPNP_E_BAD_HTTPMSG;
goto ExitFunction;
} else if (status == PARSE_INCOMPLETE_ENTITY) {
case PARSE_INCOMPLETE_ENTITY:
/* read until close */
ok_on_close = TRUE;
} else if (status == PARSE_CONTINUE_1) {
case PARSE_CONTINUE_1:
/* Web post request. */
line = __LINE__;
ret = PARSE_SUCCESS;
goto ExitFunction;
default:
break;
}
} else if (num_read == 0) {
if (ok_on_close) {
@@ -367,7 +370,7 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
size_t buf_length;
size_t num_read;
size_t num_written;
size_t amount_to_be_read = 0;
size_t amount_to_be_read = (size_t)0;
/* 10 byte allocated for chunk header. */
size_t Data_Buf_Size = WEB_SERVER_BUF_SIZE;
@@ -422,7 +425,7 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
nr = virtualDirCallback.read(Fp, file_buf, n);
num_read = (size_t)nr;
} else {
num_read = fread(file_buf, 1, n, Fp);
num_read = fread(file_buf, (size_t)1, n, Fp);
}
amount_to_be_read -= num_read;
if (Instr->ReadSendSize < 0) {
@@ -430,9 +433,9 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
amount_to_be_read = Data_Buf_Size;
}
} else {
num_read = fread(file_buf, 1, Data_Buf_Size, Fp);
num_read = fread(file_buf, (size_t)1, Data_Buf_Size, Fp);
}
if (num_read == 0) {
if (num_read == (size_t)0) {
/* EOF so no more to send. */
if (Instr && Instr->IsChunkActive) {
const char *str = "0\r\n\r\n";
@@ -469,10 +472,10 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
/*printf("Sending %s\n",file_buf-strlen(Chunk_Header)); */
nw = sock_write(info,
file_buf - strlen(Chunk_Header),
num_read + strlen(Chunk_Header) + 2,
num_read + strlen(Chunk_Header) + (size_t)2,
TimeOut);
num_written = (size_t)nw;
if (nw <= 0 || num_written != num_read + strlen(Chunk_Header) + 2)
if (nw <= 0 || num_written != num_read + strlen(Chunk_Header) + (size_t)2)
/* Send error nothing we can do. */
goto Cleanup_File;
} else {
@@ -499,7 +502,7 @@ Cleanup_File:
/* memory buffer */
buf = va_arg(argp, char *);
buf_length = va_arg(argp, size_t);
if (buf_length > 0) {
if (buf_length > (size_t)0) {
nw = sock_write(info, buf, buf_length, TimeOut);
num_written = (size_t)nw;
UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
@@ -559,7 +562,7 @@ int http_RequestAndResponse(
SOCKINFO info;
tcp_connection = socket(
destination->hostport.IPaddress.ss_family, SOCK_STREAM, 0);
(int)destination->hostport.IPaddress.ss_family, SOCK_STREAM, 0);
if (tcp_connection == INVALID_SOCKET) {
parser_response_init(response, req_method);
return UPNP_E_SOCKET_ERROR;
@@ -849,18 +852,18 @@ int http_WriteHttpPost( IN void *Handle,
{
http_post_handle_t *handle = (http_post_handle_t *)Handle;
char *tempbuf = NULL;
size_t tempbufSize = 0;
size_t tempbufSize = (size_t)0;
int freeTempbuf = 0;
int numWritten = 0;
if (!handle || !size || !buf) {
if (size)
*size = 0;
*size = (size_t)0;
return UPNP_E_INVALID_PARAM;
}
if (handle->contentLength == UPNP_USING_CHUNKED) {
if (*size) {
size_t tempSize = 0;
size_t tempSize = (size_t)0;
tempbuf = malloc(*size +
CHUNK_HEADER_SIZE + CHUNK_TAIL_SIZE);
if (!tempbuf)
@@ -871,7 +874,7 @@ int http_WriteHttpPost( IN void *Handle,
memcpy(tempbuf + tempSize, buf, *size);
memcpy(tempbuf + tempSize + *size, "\r\n", 2);
/* end of chunk */
tempbufSize = tempSize + *size + 2;
tempbufSize = tempSize + *size + (size_t)2;
freeTempbuf = 1;
}
} else {
@@ -883,7 +886,7 @@ int http_WriteHttpPost( IN void *Handle,
if (freeTempbuf)
free(tempbuf);
if (numWritten < 0) {
*size = 0;
*size = (size_t)0;
return numWritten;
} else {
*size = (size_t)numWritten;
@@ -983,7 +986,7 @@ int http_OpenHttpPost(
if (!handle)
return UPNP_E_OUTOF_MEMORY;
handle->contentLength = contentLength;
tcp_connection = socket(url.hostport.IPaddress.ss_family,
tcp_connection = socket((int)url.hostport.IPaddress.ss_family,
SOCK_STREAM, 0);
if (tcp_connection == INVALID_SOCKET) {
ret_code = UPNP_E_SOCKET_ERROR;
@@ -1238,31 +1241,35 @@ int http_ReadHttpGet(
char tempbuf[2 * 1024];
int ret_code = 0;
if (!handle || !size || (*size > 0 && !buf)) {
if (!handle || !size || (*size > (size_t)0 && !buf)) {
if (size)
*size = 0;
*size = (size_t)0;
return UPNP_E_INVALID_PARAM;
}
/* first parse what has already been gotten */
if (handle->response.position != POS_COMPLETE)
if (handle->response.position != (parser_pos_t)POS_COMPLETE)
status = parser_parse_entity(&handle->response);
else
status = PARSE_SUCCESS;
if (status == PARSE_INCOMPLETE_ENTITY)
switch (status) {
case PARSE_INCOMPLETE_ENTITY:
/* read until close */
ok_on_close = TRUE;
else if ((status != PARSE_SUCCESS)
&& (status != PARSE_CONTINUE_1)
&& (status != PARSE_INCOMPLETE)) {
break;
case PARSE_SUCCESS:
case PARSE_CONTINUE_1:
case PARSE_INCOMPLETE:
break;
default:
/*error */
*size = 0;
*size = (size_t)0;
return UPNP_E_BAD_RESPONSE;
}
/* read more if necessary entity */
while (handle->response.msg.amount_discarded + *size >
handle->response.msg.entity.length &&
!handle->cancel &&
handle->response.position != POS_COMPLETE) {
handle->response.position != (parser_pos_t)POS_COMPLETE) {
num_read = sock_read(&handle->sock_info, tempbuf,
sizeof(tempbuf), &timeout);
if (num_read > 0) {
@@ -1273,18 +1280,22 @@ int http_ReadHttpGet(
/* set failure status */
handle->response.http_error_code =
HTTP_INTERNAL_SERVER_ERROR;
*size = 0;
*size = (size_t)0;
return PARSE_FAILURE;
}
status = parser_parse_entity(&handle->response);
if (status == PARSE_INCOMPLETE_ENTITY) {
switch (status) {
case PARSE_INCOMPLETE_ENTITY:
/* read until close */
ok_on_close = TRUE;
} else if ((status != PARSE_SUCCESS)
&& (status != PARSE_CONTINUE_1)
&& (status != PARSE_INCOMPLETE)) {
break;
case PARSE_SUCCESS:
case PARSE_CONTINUE_1:
case PARSE_INCOMPLETE:
break;
default:
/*error */
*size = 0;
*size = (size_t)0;
return UPNP_E_BAD_RESPONSE;
}
} else if (num_read == 0) {
@@ -1295,12 +1306,12 @@ int http_ReadHttpGet(
handle->response.position = POS_COMPLETE;
} else {
/* partial msg */
*size = 0;
*size = (size_t)0;
handle->response.http_error_code = HTTP_BAD_REQUEST; /* or response */
return UPNP_E_BAD_HTTPMSG;
}
} else {
*size = 0;
*size = (size_t)0;
return num_read;
}
}
@@ -1313,7 +1324,7 @@ int http_ReadHttpGet(
*size = handle->response.msg.entity.length -
handle->response.msg.amount_discarded;
/* copy data to user buffer. delete copied data */
if (*size > 0) {
if (*size > (size_t)0) {
memcpy(buf, &handle->response.msg.msg.buf[handle->response.entity_start_position],
*size);
membuffer_delete(&handle->response.msg.msg,
@@ -1497,8 +1508,11 @@ int http_OpenHttpGetProxy(const char *url_str, const char *proxy_str,
goto errorHandler;
}
status = parser_get_entity_read_method(&handle->response);
if (status != (parse_status_t)PARSE_CONTINUE_1 &&
status != (parse_status_t)PARSE_SUCCESS) {
switch (status) {
case PARSE_CONTINUE_1:
case PARSE_SUCCESS:
break;
default:
ret_code = UPNP_E_BAD_RESPONSE;
goto errorHandler;
}
@@ -1509,7 +1523,7 @@ int http_OpenHttpGetProxy(const char *url_str, const char *proxy_str,
*contentType = NULL;
else
*contentType = ctype.buf;
if (handle->response.position == POS_COMPLETE)
if (handle->response.position == (parser_pos_t)POS_COMPLETE)
*contentLength = 0;
else if (handle->response.ent_position == ENTREAD_USING_CHUNKED)
*contentLength = UPNP_USING_CHUNKED;
@@ -1557,7 +1571,7 @@ int http_SendStatusResponse(IN SOCKINFO *info, IN int http_status_code,
http_CalcResponseVersion(request_major_version, request_minor_version,
&response_major, &response_minor);
membuffer_init(&membuf);
membuf.size_inc = 70;
membuf.size_inc = (size_t)70;
/* response start line */
ret = http_MakeMessage(&membuf, response_major, response_minor, "RSCB",
http_status_code, http_status_code);