X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Futils.cpp;h=5a5dc0487c0f1bf4dbd9132143e14567d7c30574;hb=c8df43e7794dc82d5604dfa612e464bbc5ca3cdd;hp=b6340db7dfd2da87a9abc6c9cbb8baabb6fba999;hpb=f53eda26a3160972908f15c2427a60b0b82fbe87;p=libs%2Fnet.git

diff --git a/source/utils.cpp b/source/utils.cpp
index b6340db..5a5dc04 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmsphttp
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
 #include <msp/strings/formatter.h>
 #include <msp/strings/regex.h>
@@ -41,9 +34,9 @@ string urlencode(const string &str, EncodeLevel level)
 	for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
 	{
 		if(is_reserved(*i, level))
-			result+=format("%%%02X", *i);
+			result += format("%%%02X", *i);
 		else
-			result+=*i;
+			result += *i;
 	}
 	return result;
 }
@@ -54,11 +47,11 @@ string urlencode_plus(const string &str, EncodeLevel level)
 	for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
 	{
 		if(*i==' ')
-			result+='+';
+			result += '+';
 		else if(is_reserved(*i, level))
-			result+=format("%%%02X", *i);
+			result += format("%%%02X", *i);
 		else
-			result+=*i;
+			result += *i;
 	}
 	return result;
 }
@@ -68,18 +61,18 @@ string urldecode(const string &str)
 	string result;
 	for(unsigned i=0; i<str.size(); ++i)
 	{
-		char c=str[i];
+		char c = str[i];
 		if(c=='%')
 		{
 			if(i+3>str.size())
-				throw InvalidParameterValue("Malformed data");
-			result+=lexical_cast<unsigned char>(str.substr(i+1, 2), "x");
-			i+=2;
+				throw invalid_argument("urldecode");
+			result += lexical_cast<unsigned char>(str.substr(i+1, 2), "x");
+			i += 2;
 		}
 		else if(c=='+')
-			result+=' ';
+			result += ' ';
 		else
-			result+=c;
+			result += c;
 	}
 	return result;
 }
@@ -87,52 +80,53 @@ string urldecode(const string &str)
 Url parse_url(const string &str)
 {
 	static Regex r_url("(([a-z]+)://)?([a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*(:[0-9])?)?(/[^?#]*)?(\\?([^#]+))?(#(.*))?");
-	if(RegMatch m=r_url.match(str))
+	if(RegMatch m = r_url.match(str))
 	{
 		Url url;
-		url.scheme=m[2].str;
-		url.host=m[3].str;
-		url.path=urldecode(m[6].str);
-		url.query=m[8].str;
-		url.fragment=m[10].str;
+		url.scheme = m[2].str;
+		url.host = m[3].str;
+		url.path = urldecode(m[6].str);
+		url.query = m[8].str;
+		url.fragment = m[10].str;
 		return url;
 	}
 	else
-		throw InvalidParameterValue("Invalid URL");
+		throw invalid_argument("parse_url");
 }
 
 string build_url(const Url &url)
 {
 	if(!url.path.empty() && url.path[0]!='/')
-		throw InvalidParameterValue("Only absolute paths are supported");
+		throw invalid_argument("build_url");
+
 	string str;
 	if(!url.scheme.empty())
-		str+=url.scheme+"://";
-	str+=url.host;
-	str+=urlencode(url.path);
+		str += url.scheme+"://";
+	str += url.host;
+	str += urlencode(url.path);
 	if(!url.query.empty())
 	{
-		str+='?';
-		str+=url.query;
+		str += '?';
+		str += url.query;
 	}
 	if(!url.fragment.empty())
 	{
-		str+='#';
-		str+=url.fragment;
+		str += '#';
+		str += url.fragment;
 	}
 	return str;
 }
 
 Query parse_query(const std::string &str)
 {
-	vector<string> parts=split(str, '&');
+	vector<string> parts = split(str, '&');
 	Query query;
 	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
-		unsigned equals=i->find('=');
-		string &value=query[urldecode(i->substr(0, equals))];
+		unsigned equals = i->find('=');
+		string &value = query[urldecode(i->substr(0, equals))];
 		if(equals!=string::npos)
-			value=urldecode(i->substr(equals+1));
+			value = urldecode(i->substr(equals+1));
 	}
 	return query;
 }
@@ -143,10 +137,10 @@ string build_query(const Query &query)
 	for(Query::const_iterator i=query.begin(); i!=query.end(); ++i)
 	{
 		if(i!=query.begin())
-			str+='&';
-		str+=urlencode_plus(i->first);
-		str+='=';
-		str+=urlencode_plus(i->second);
+			str += '&';
+		str += urlencode_plus(i->first);
+		str += '=';
+		str += urlencode_plus(i->second);
 	}
 	return str;
 }