summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorSquire <squire@lindenlab.com>2011-06-21 20:46:32 -0700
committerSquire <squire@lindenlab.com>2011-06-21 20:46:32 -0700
commit14105610c7fb295a16b3b2a88014004c62ffa265 (patch)
treec6e3c0297c5ca56c9bc1986eb27a4f9d10392ff5 /indra/llvfs
parenta975df88f03a301bfaf4ba0b9015e46db02d399f (diff)
CHOP-662 cleanup in response to code review.
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldiriterator.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
index 3b132862ad..25550321f0 100644
--- a/indra/llvfs/lldiriterator.cpp
+++ b/indra/llvfs/lldiriterator.cpp
@@ -121,13 +121,13 @@ bool LLDirIterator::Impl::next(std::string &fname)
return found;
}
-/*
-converts the incoming glob into a regex. This involves
+/**
+Converts the incoming glob into a regex. This involves
converting incoming glob expressions to regex equivilents and
at the same time, escaping any regex meaningful characters which
do not have glob meaning, i.e.
.()+|^$
-in the input
+in the input.
*/
std::string glob_to_regex(const std::string& glob)
{
@@ -176,15 +176,15 @@ std::string glob_to_regex(const std::string& glob)
regex+= square_brace_open ? '^' : c;
break;
case '.': // This collection have different regex meaning
- case '^': // And so need escaping
+ case '^': // and so need escaping.
case '(':
case ')':
case '+':
case '|':
case '$':
- regex+='\\';
- default:
- regex+=c;
+ regex += '\\';
+ default:
+ regex += c;
break;
}