From 0e37d600ad0ca86f39642db9cb88c02e2757856a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Grome=C5=A1?= Date: Mon, 23 Jul 2018 12:41:24 +0200 Subject: [PATCH] HTTP - reworked status codes --- src/protocols/HTTP.cpp | 12 ++++++------ src/protocols/HTTP.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/protocols/HTTP.cpp b/src/protocols/HTTP.cpp index b8ac9f05..8a5cce8b 100644 --- a/src/protocols/HTTP.cpp +++ b/src/protocols/HTTP.cpp @@ -5,7 +5,7 @@ HTTPClient::HTTPClient(TransportLayer* tl, uint16_t port) { _port = port; } -uint16_t HTTPClient::get(const char* url, String& response) { +int16_t HTTPClient::get(const char* url, String& response) { // get the host address and endpoint char* httpPrefix = strstr(url, "http://"); char* endpoint; @@ -45,7 +45,7 @@ uint16_t HTTPClient::get(const char* url, String& response) { delete[] endpoint; // create TCP connection - uint8_t state = _tl->openTransportConnection(host, "TCP", _port); + int16_t state = _tl->openTransportConnection(host, "TCP", _port); delete[] host; if(state != ERR_NONE) { delete[] request; @@ -62,7 +62,7 @@ uint16_t HTTPClient::get(const char* url, String& response) { //delay(1000); // get the response length - uint16_t numBytes = _tl->getNumBytes(); + size_t numBytes = _tl->getNumBytes(); if(numBytes == 0) { return(ERR_RESPONSE_MALFORMED_AT); } @@ -106,7 +106,7 @@ uint16_t HTTPClient::get(const char* url, String& response) { return(atoi(statusStr)); } -uint16_t HTTPClient::post(const char* url, const char* content, String& response, const char* contentType) { +int16_t HTTPClient::post(const char* url, const char* content, String& response, const char* contentType) { // get the host address and endpoint char* httpPrefix = strstr(url, "http://"); char* endpoint; @@ -154,7 +154,7 @@ uint16_t HTTPClient::post(const char* url, const char* content, String& response delete[] endpoint; // create TCP connection - uint8_t state = _tl->openTransportConnection(host, "TCP", _port); + int16_t state = _tl->openTransportConnection(host, "TCP", _port); delete[] host; if(state != ERR_NONE) { return(state); @@ -168,7 +168,7 @@ uint16_t HTTPClient::post(const char* url, const char* content, String& response } // get the response length - uint16_t numBytes = _tl->getNumBytes(); + size_t numBytes = _tl->getNumBytes(); if(numBytes == 0) { return(ERR_RESPONSE_MALFORMED_AT); } diff --git a/src/protocols/HTTP.h b/src/protocols/HTTP.h index 8339360a..2dcc7dca 100644 --- a/src/protocols/HTTP.h +++ b/src/protocols/HTTP.h @@ -10,8 +10,8 @@ class HTTPClient { HTTPClient(TransportLayer* tl, uint16_t port = 80); // basic methods - uint16_t get(const char* url, String& response); - uint16_t post(const char* url, const char* content, String& response, const char* contentType = "text/plain"); + int16_t get(const char* url, String& response); + int16_t post(const char* url, const char* content, String& response, const char* contentType = "text/plain"); private: TransportLayer* _tl;