Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

rename string literal names to replace odd camel case

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-27 11:52:56 +01:00
parent 3e47fe54fa
commit 872cb2d9c8
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Server/Http/Reply.cpp
View File

@ -32,15 +32,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace http namespace http
{ {
const char okHTML[] = ""; const char ok_html[] = "";
const char badRequestHTML[] = "{\"status\": 400,\"status_message\":\"Bad Request\"}"; const char bad_request_html[] = "{\"status\": 400,\"status_message\":\"Bad Request\"}";
const char internalServerErrorHTML[] = const char internal_server_error_html[] =
"{\"status\": 500,\"status_message\":\"Internal Server Error\"}"; "{\"status\": 500,\"status_message\":\"Internal Server Error\"}";
const char seperators[] = {':', ' '}; const char seperators[] = {':', ' '};
const char crlf[] = {'\r', '\n'}; const char crlf[] = {'\r', '\n'};
const std::string okString = "HTTP/1.0 200 OK\r\n"; const std::string http_ok_string = "HTTP/1.0 200 OK\r\n";
const std::string badRequestString = "HTTP/1.0 400 Bad Request\r\n"; const std::string http_bad_request_string = "HTTP/1.0 400 Bad Request\r\n";
const std::string internalServerErrorString = "HTTP/1.0 500 Internal Server Error\r\n"; const std::string http_internal_server_error_string = "HTTP/1.0 500 Internal Server Error\r\n";
void reply::set_size(const std::size_t size) void reply::set_size(const std::size_t size)
{ {
@ -104,26 +104,26 @@ std::string reply::status_to_string(const reply::status_type status)
{ {
if (reply::ok == status) if (reply::ok == status)
{ {
return okHTML; return ok_html;
} }
if (reply::bad_request == status) if (reply::bad_request == status)
{ {
return badRequestHTML; return bad_request_html;
} }
return internalServerErrorHTML; return internal_server_error_html;
} }
boost::asio::const_buffer reply::status_to_buffer(const reply::status_type status) boost::asio::const_buffer reply::status_to_buffer(const reply::status_type status)
{ {
if (reply::ok == status) if (reply::ok == status)
{ {
return boost::asio::buffer(okString); return boost::asio::buffer(http_ok_string);
} }
if (reply::internal_server_error == status) if (reply::internal_server_error == status)
{ {
return boost::asio::buffer(internalServerErrorString); return boost::asio::buffer(http_internal_server_error_string);
} }
return boost::asio::buffer(badRequestString); return boost::asio::buffer(http_bad_request_string);
} }
reply::reply() : status(ok) {} reply::reply() : status(ok) {}

1
Server/http/header.hpp
View File

@ -35,6 +35,7 @@ namespace http
{ {
struct header struct header
{ {
// explicitly use default copy c'tor as adding move c'tor
header &operator=(const header &other) = default; header &operator=(const header &other) = default;
header(const std::string &name, const std::string &value) : name(name), value(value) {} header(const std::string &name, const std::string &value) : name(name), value(value) {}
header(header &&other) : name(std::move(other.name)), value(std::move(other.value)) {} header(header &&other) : name(std::move(other.name)), value(std::move(other.value)) {}

24
Server/http/reply.cpp
View File

@ -32,15 +32,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace http namespace http
{ {
const char okHTML[] = ""; const char ok_html[] = "";
const char badRequestHTML[] = "{\"status\": 400,\"status_message\":\"Bad Request\"}"; const char bad_request_html[] = "{\"status\": 400,\"status_message\":\"Bad Request\"}";
const char internalServerErrorHTML[] = const char internal_server_error_html[] =
"{\"status\": 500,\"status_message\":\"Internal Server Error\"}"; "{\"status\": 500,\"status_message\":\"Internal Server Error\"}";
const char seperators[] = {':', ' '}; const char seperators[] = {':', ' '};
const char crlf[] = {'\r', '\n'}; const char crlf[] = {'\r', '\n'};
const std::string okString = "HTTP/1.0 200 OK\r\n"; const std::string http_ok_string = "HTTP/1.0 200 OK\r\n";
const std::string badRequestString = "HTTP/1.0 400 Bad Request\r\n"; const std::string http_bad_request_string = "HTTP/1.0 400 Bad Request\r\n";
const std::string internalServerErrorString = "HTTP/1.0 500 Internal Server Error\r\n"; const std::string http_internal_server_error_string = "HTTP/1.0 500 Internal Server Error\r\n";
void reply::set_size(const std::size_t size) void reply::set_size(const std::size_t size)
{ {
@ -104,26 +104,26 @@ std::string reply::status_to_string(const reply::status_type status)
{ {
if (reply::ok == status) if (reply::ok == status)
{ {
return okHTML; return ok_html;
} }
if (reply::bad_request == status) if (reply::bad_request == status)
{ {
return badRequestHTML; return bad_request_html;
} }
return internalServerErrorHTML; return internal_server_error_html;
} }
boost::asio::const_buffer reply::status_to_buffer(const reply::status_type status) boost::asio::const_buffer reply::status_to_buffer(const reply::status_type status)
{ {
if (reply::ok == status) if (reply::ok == status)
{ {
return boost::asio::buffer(okString); return boost::asio::buffer(http_ok_string);
} }
if (reply::internal_server_error == status) if (reply::internal_server_error == status)
{ {
return boost::asio::buffer(internalServerErrorString); return boost::asio::buffer(http_internal_server_error_string);
} }
return boost::asio::buffer(badRequestString); return boost::asio::buffer(http_bad_request_string);
} }
reply::reply() : status(ok) {} reply::reply() : status(ok) {}