github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

uri.cc: Use auto instead of adhoc typedef

pull/135/merge
Tatsuhiro Tsujikawa 2013-09-23 14:29:24 +09:00
parent d2af91ed08
commit 8536f13cff
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uri.cc
View File

@ -235,16 +235,14 @@ namespace {
std::string normalizePath(std::string path) std::string normalizePath(std::string path)
{ {
typedef std::string::iterator itr; auto begin = path.begin(), out = begin;
itr begin = path.begin(), out = begin;
int state = NPATH_START; int state = NPATH_START;
bool startWithSlash = false; bool startWithSlash = false;
std::vector<int> range; std::vector<int> range;
// 32 is arbitrary // 32 is arbitrary
range.reserve(32); range.reserve(32);
for(itr in = begin, eoi = path.end(); in != eoi; ++in) { for(auto in = begin, eoi = path.end(); in != eoi; ++in) {
switch(state) { switch(state) {
case NPATH_START: case NPATH_START:
switch(*in) { switch(*in) {
@ -336,8 +334,8 @@ std::string normalizePath(std::string path)
} }
for(int i = 0; i < (int)range.size(); i += 2) { for(int i = 0; i < (int)range.size(); i += 2) {
itr a = begin + range[i]; auto a = begin + range[i];
itr b = begin + range[i+1]; auto b = begin + range[i+1];
if(a == out) { if(a == out) {
out = b; out = b;
} else { } else {