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

reformat files according to guidelines, remove superflous inclue

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-07 16:58:32 +02:00
parent 7b9b2fd23a
commit db67f2ddf1
3 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Server/Http/CompressionType.h
View File

@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef BASIC_DATASTRUCTURES_H
#define BASIC_DATASTRUCTURES_H
#ifndef COMPRESSION_TYPE_H
#define COMPRESSION_TYPE_H
namespace http {
namespace http
{
enum CompressionType {
noCompression,
gzipRFC1952,
deflateRFC1951
};
enum CompressionType
{ noCompression,
gzipRFC1952,
deflateRFC1951 };
} // namespace http
#endif //BASIC_DATASTRUCTURES_H
#endif // COMPRESSION_TYPE_H

49
Server/Http/Reply.cpp
View File

@ -29,12 +29,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../Util/StringUtil.h"
namespace http {
namespace http
{
void Reply::setSize(const unsigned size) {
for ( Header& h : headers) {
if("Content-Length" == h.name) {
intToString(size,h.value);
void Reply::setSize(const unsigned size)
{
for (Header &h : headers)
{
if ("Content-Length" == h.name)
{
intToString(size, h.value);
}
}
}
@ -43,35 +47,39 @@ void Reply::setSize(const unsigned size) {
void Reply::SetUncompressedSize()
{
unsigned uncompressed_size = 0;
for ( const std::string & current_line : content)
for (const std::string &current_line : content)
{
uncompressed_size += current_line.size();
}
setSize(uncompressed_size);
}
std::vector<boost::asio::const_buffer> Reply::toBuffers(){
std::vector<boost::asio::const_buffer> Reply::toBuffers()
{
std::vector<boost::asio::const_buffer> buffers;
buffers.push_back(ToBuffer(status));
for (const Header & h : headers) {
for (const Header &h : headers)
{
buffers.push_back(boost::asio::buffer(h.name));
buffers.push_back(boost::asio::buffer(seperators));
buffers.push_back(boost::asio::buffer(h.value));
buffers.push_back(boost::asio::buffer(crlf));
}
buffers.push_back(boost::asio::buffer(crlf));
for (const std::string & line : content) {
for (const std::string &line : content)
{
buffers.push_back(boost::asio::buffer(line));
}
return buffers;
}
std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers(){
std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers()
{
std::vector<boost::asio::const_buffer> buffers;
buffers.push_back(ToBuffer(status));
for (std::size_t i = 0; i < headers.size(); ++i) {
Header& current_header = headers[i];
for (std::size_t i = 0; i < headers.size(); ++i)
{
Header &current_header = headers[i];
buffers.push_back(boost::asio::buffer(current_header.name));
buffers.push_back(boost::asio::buffer(seperators));
buffers.push_back(boost::asio::buffer(current_header.value));
@ -81,7 +89,8 @@ std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers(){
return buffers;
}
Reply Reply::StockReply(Reply::status_type status) {
Reply Reply::StockReply(Reply::status_type status)
{
Reply rep;
rep.status = status;
rep.content.clear();
@ -100,7 +109,8 @@ Reply Reply::StockReply(Reply::status_type status) {
return rep;
}
std::string Reply::ToString(Reply::status_type status) {
std::string Reply::ToString(Reply::status_type status)
{
if (Reply::ok == status)
{
return okHTML;
@ -112,7 +122,8 @@ std::string Reply::ToString(Reply::status_type status) {
return internalServerErrorHTML;
}
boost::asio::const_buffer Reply::ToBuffer(Reply::status_type status) {
boost::asio::const_buffer Reply::ToBuffer(Reply::status_type status)
{
if (Reply::ok == status)
{
return boost::asio::buffer(okString);
@ -124,9 +135,5 @@ boost::asio::const_buffer Reply::ToBuffer(Reply::status_type status) {
return boost::asio::buffer(badRequestString);
}
Reply::Reply() : status(ok) {
}
Reply::Reply() : status(ok) {}
}

18
Server/Http/Request.h
View File

@ -28,21 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef REQUEST_H
#define REQUEST_H
#include "../../Util/StringUtil.h"
#include <boost/asio.hpp>
#include <string>
namespace http {
namespace http
{
struct Request {
std::string uri;
std::string referrer;
std::string agent;
boost::asio::ip::address endpoint;
struct Request
{
std::string uri;
std::string referrer;
std::string agent;
boost::asio::ip::address endpoint;
};
} // namespace http
#endif //REQUEST_H
#endif // REQUEST_H