Style update: spaces around assignments

[libs/net.git] / source / message.cpp

diff --git a/source/message.cpp b/source/message.cpp
index 4aaa8bfd26d1fab34302cd6f32e0c583bac133fe..2223377cb6bea79e5379cce50a3b0164c7d3aafe 100644 (file)
--- a/source/message.cpp
+++ b/source/message.cpp
@@ -23,7 +23,7 @@ Message::Message():
 
 void Message::set_header(const string &hdr, const string &val)
 {
-       headers[normalize_header_name(hdr)]=val;
+       headers[normalize_header_name(hdr)] = val;
 }
 
 bool Message::has_header(const string &hdr) const
@@ -33,7 +33,7 @@ bool Message::has_header(const string &hdr) const
 
 const string &Message::get_header(const string &hdr) const
 {
-       HeaderMap::const_iterator i=headers.find(normalize_header_name(hdr));
+       HeaderMap::const_iterator i = headers.find(normalize_header_name(hdr));
        if(i==headers.end())
                throw KeyError("Undefined header", hdr);
 
@@ -42,7 +42,7 @@ const string &Message::get_header(const string &hdr) const
 
 void Message::add_content(const string &d)
 {
-       content+=d;
+       content += d;
        if(headers.count("Content-Type")==0)
                set_header("Content-Type", "text/plain");
        set_header("Content-Length", lexical_cast(content.size()));
@@ -50,7 +50,7 @@ void Message::add_content(const string &d)
 
 void Message::set_user_data(const Variant &d)
 {
-       user_data=d;
+       user_data = d;
 }
 
 unsigned Message::parse_content(const string &d)
@@ -58,42 +58,42 @@ unsigned Message::parse_content(const string &d)
        if(complete)
                return 0;
 
-       HeaderMap::const_iterator i=headers.find("Content-Length");
+       HeaderMap::const_iterator i = headers.find("Content-Length");
        if(i!=headers.end())
        {
-               unsigned needed=lexical_cast<unsigned>(i->second)-content.size();
-               unsigned len=min(needed, d.size());
+               unsigned needed = lexical_cast<unsigned>(i->second)-content.size();
+               unsigned len = min(needed, d.size());
                
                content.append(d, 0, len);
 
                if(len==needed)
-                       complete=true;
+                       complete = true;
                
                return len;
        }
 
-       i=headers.find("Transfer-Encoding");
+       i = headers.find("Transfer-Encoding");
        if(i!=headers.end() && strcasecmp(i->second, "chunked")==0)
        {
-               unsigned pos=0;
+               unsigned pos = 0;
                while(!complete && pos<d.size())
                {
                        if(chunk_length==0)
                        {
-                               unsigned lf=d.find('\n', pos);
+                               unsigned lf = d.find('\n', pos);
                                if(lf==string::npos)
                                        return pos;
-                               chunk_length=lexical_cast<unsigned>(strip(d.substr(pos, lf-pos)), "x");
+                               chunk_length = lexical_cast<unsigned>(strip(d.substr(pos, lf-pos)), "x");
                                if(chunk_length==0)
-                                       complete=true;
-                               pos=lf+1;
+                                       complete = true;
+                               pos = lf+1;
                        }
                        else
                        {
-                               unsigned len=min(chunk_length, d.size()-pos);
+                               unsigned len = min(chunk_length, d.size()-pos);
                                content.append(d, pos, len);
-                               chunk_length-=len;
-                               if((pos=d.find('\n', pos+len))!=string::npos)
+                               chunk_length -= len;
+                               if((pos = d.find('\n', pos+len))!=string::npos)
                                        ++pos;
                        }
                }
@@ -101,28 +101,28 @@ unsigned Message::parse_content(const string &d)
                return pos;
        }
 
-       complete=true;
+       complete = true;
        return 0;
 }
 
 unsigned Message::parse_headers(const string &d)
 {
-       unsigned start=0;
+       unsigned start = 0;
        while(1)
        {
-               unsigned lf=d.find('\n', start);
+               unsigned lf = d.find('\n', start);
                if(lf==string::npos)
                        throw InvalidParameterValue("Incomplete response");
                if(lf==start || (d[start]=='\r' && lf==start+1))
                        return lf+1;
 
-               unsigned colon=d.find(':', start);
+               unsigned colon = d.find(':', start);
                if(colon>lf)
                        throw InvalidParameterValue("No colon in header");
 
                set_header(d.substr(start, colon-start), strip(d.substr(colon+1, lf-colon-1)));
 
-               start=lf+1;
+               start = lf+1;
        }
 }
 
@@ -132,28 +132,28 @@ string Message::str_common() const
 
        for(HeaderMap::const_iterator i=headers.begin(); i!=headers.end(); ++i)
                if(i->first[0]!='-')
-                       result+=format("%s: %s\r\n", i->first, i->second);
-       result+="\r\n";
-       result+=content;
+                       result += format("%s: %s\r\n", i->first, i->second);
+       result += "\r\n";
+       result += content;
 
        return result;
 }
 
 string Message::normalize_header_name(const string &hdr) const
 {
-       string result=hdr;
-       bool upper=true;
+       string result = hdr;
+       bool upper = true;
        for(string::iterator i=result.begin(); i!=result.end(); ++i)
        {
                if(upper)
                {
-                       *i=toupper(*i);
-                       upper=false;
+                       *i = toupper(*i);
+                       upper = false;
                }
                else if(*i=='-')
-                       upper=true;
+                       upper = true;
                else
-                       *i=tolower(*i);
+                       *i = tolower(*i);
        }
        return result;
 }