Nigel Rantor
/
azure_c_shared_utility
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Fork of
azure_c_shared_utility
by 
Azure IoT
Diff: httpapi_mbed.cpp
- Revision:
- 1:9190c0f4d23a
- Parent:
- 0:fa2de1b79154
diff -r fa2de1b79154 -r 9190c0f4d23a httpapi_mbed.cpp
--- a/httpapi_mbed.cpp Fri Apr 08 12:01:36 2016 -0700
+++ b/httpapi_mbed.cpp Sun Apr 24 16:41:14 2016 -0700
@@ -38,7 +38,7 @@
time_t ctTime;
ctTime = time(NULL);
HTTPAPI_RESULT result;
- LogInfo("HTTAPI_Init::Time is now (UTC) %s\r\n", ctime(&ctTime));
+ LogInfo("HTTAPI_Init::Time is now (UTC) %s", ctime(&ctTime));
result = HTTPAPI_OK;
@@ -59,7 +59,7 @@
handle = new HTTP_HANDLE_DATA();
if (strcpy_s(handle->host, MAX_HOSTNAME, hostName) != 0)
{
- LogError("HTTPAPI_CreateConnection::Could not strcpy_s\r\n");
+ LogError("HTTPAPI_CreateConnection::Could not strcpy_s");
delete handle;
handle = NULL;
}
@@ -70,7 +70,7 @@
}
else
{
- LogInfo("HTTPAPI_CreateConnection:: null hostName parameter\r\n");
+ LogInfo("HTTPAPI_CreateConnection:: null hostName parameter");
}
return (HTTP_HANDLE)handle;
@@ -84,7 +84,7 @@
{
if (h->con.is_connected())
{
- LogInfo("HTTPAPI_CloseConnection h->con.close(); to %s\r\n", h->host);
+ LogInfo("HTTPAPI_CloseConnection h->con.close(); to %s", h->host);
h->con.close();
}
if (h->certificate)
@@ -190,7 +190,7 @@
HTTPHeaders_GetHeaderCount(httpHeadersHandle, &headersCount) != HTTP_HEADERS_OK)
{
result = HTTPAPI_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -204,7 +204,7 @@
(!con->load_certificate((const unsigned char*)httpHandle->certificate, strlen(httpHandle->certificate) + 1)))
{
result = HTTPAPI_ERROR;
- LogError("Could not load certificate (result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("Could not load certificate (result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -212,7 +212,7 @@
if (con->connect(httpHandle->host, 443) != 0)
{
result = HTTPAPI_ERROR;
- LogError("Could not connect (result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("Could not connect (result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -222,13 +222,13 @@
|| ret >= sizeof(buf))
{
result = HTTPAPI_STRING_PROCESSING_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
if (con->send_all(buf, strlen(buf)) < 0)
{
result = HTTPAPI_SEND_REQUEST_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -239,20 +239,20 @@
if (HTTPHeaders_GetHeader(httpHeadersHandle, i, &header) != HTTP_HEADERS_OK)
{
result = HTTPAPI_HTTP_HEADERS_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
if (con->send_all(header, strlen(header)) < 0)
{
result = HTTPAPI_SEND_REQUEST_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
free(header);
goto exit;
}
if (con->send_all("\r\n", 2) < 0)
{
result = HTTPAPI_SEND_REQUEST_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
free(header);
goto exit;
}
@@ -263,7 +263,7 @@
if (con->send_all("\r\n", 2) < 0)
{
result = HTTPAPI_SEND_REQUEST_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -273,7 +273,7 @@
if (con->send_all((char*)content, contentLength) < 0)
{
result = HTTPAPI_SEND_REQUEST_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -282,7 +282,7 @@
if (readLine(con, buf, sizeof(buf)) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -290,9 +290,9 @@
if (sscanf(buf, "HTTP/%*d.%*d %d %*[^\r\n]", &ret) != 1)
{
//Cannot match string, error
- LogInfo("HTTPAPI_ExecuteRequest::Not a correct HTTP answer=%s\r\n", buf);
+ LogInfo("HTTPAPI_ExecuteRequest::Not a correct HTTP answer=%s", buf);
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
if (statusCode)
@@ -302,7 +302,7 @@
if (readLine(con, buf, sizeof(buf)) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -316,7 +316,7 @@
if (sscanf(buf + CHAR_COUNT(ContentLength), " %d", &bodyLength) != 1)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -338,7 +338,7 @@
if (readLine(con, buf, sizeof(buf)) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -353,20 +353,20 @@
if (BUFFER_pre_build(responseContent, bodyLength) != 0)
{
result = HTTPAPI_ALLOC_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
}
else if (BUFFER_content(responseContent, &receivedContent) != 0)
{
(void)BUFFER_unbuild(responseContent);
result = HTTPAPI_ALLOC_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
}
if (readChunk(con, (char*)receivedContent, bodyLength) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
else
@@ -395,14 +395,14 @@
if (readLine(con, buf, sizeof(buf)) < 0) // read [length in hex]/r/n
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
if (sscanf(buf, "%x", &chunkSize) != 1) // chunkSize is length of next line (/r/n is not counted)
{
//Cannot match string, error
result = HTTPAPI_RECEIVE_RESPONSE_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
@@ -415,7 +415,7 @@
(void)BUFFER_unbuild(responseContent);
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
break;
@@ -429,20 +429,20 @@
(void)BUFFER_unbuild(responseContent);
result = HTTPAPI_ALLOC_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
}
else if (BUFFER_content(responseContent, &receivedContent) != 0)
{
(void)BUFFER_unbuild(responseContent);
result = HTTPAPI_ALLOC_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
}
if (readChunk(con, (char*)receivedContent + size, chunkSize) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -451,7 +451,7 @@
if (skipN(con, chunkSize, buf, sizeof(buf)) < 0)
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
}
@@ -460,7 +460,7 @@
|| buf[0] != '\r' || buf[1] != '\n') // skip /r/n
{
result = HTTPAPI_READ_DATA_FAILED;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(HTTPAPI_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(HTTPAPI_RESULT, result));
goto exit;
}
size += chunkSize;
@@ -483,7 +483,7 @@
)
{
result = HTTPAPI_INVALID_ARG;
- LogError("invalid parameter (NULL) passed to HTTPAPI_SetOption\r\n");
+ LogError("invalid parameter (NULL) passed to HTTPAPI_SetOption");
}
else if (strcmp("TrustedCerts", optionName) == 0)
{
@@ -498,7 +498,7 @@
if (h->certificate == NULL)
{
result = HTTPAPI_ERROR;
- LogError("unable to allocate certificate memory in HTTPAPI_SetOption\r\n");
+ LogError("unable to allocate certificate memory in HTTPAPI_SetOption");
}
else
{
@@ -509,7 +509,7 @@
else
{
result = HTTPAPI_INVALID_ARG;
- LogError("unknown option %s\r\n", optionName);
+ LogError("unknown option %s", optionName);
}
return result;
}
@@ -524,7 +524,7 @@
)
{
result = HTTPAPI_INVALID_ARG;
- LogError("invalid argument(NULL) passed to HTTPAPI_CloneOption\r\n");
+ LogError("invalid argument(NULL) passed to HTTPAPI_CloneOption");
}
else if (strcmp("TrustedCerts", optionName) == 0)
{
@@ -533,7 +533,7 @@
if (tempCert == NULL)
{
result = HTTPAPI_INVALID_ARG;
- LogError("unable to allocate certificate memory in HTTPAPI_CloneOption\r\n");
+ LogError("unable to allocate certificate memory in HTTPAPI_CloneOption");
}
else
{
@@ -545,7 +545,7 @@
else
{
result = HTTPAPI_INVALID_ARG;
- LogError("unknown option %s\r\n", optionName);
+ LogError("unknown option %s", optionName);
}
return result;
}