From 14105610c7fb295a16b3b2a88014004c62ffa265 Mon Sep 17 00:00:00 2001
From: Squire <squire@lindenlab.com>
Date: Tue, 21 Jun 2011 20:46:32 -0700
Subject: [PATCH] CHOP-662 cleanup in response to code review.

---
 doc/contributions.txt         |  2 --
 indra/llvfs/lldiriterator.cpp | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index de917d4f18..b744f4db3e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -759,8 +759,6 @@ SpacedOut Frye
 	VWR-1823
 Sporked Friis
 	VWR-4903
-Squire Linden
-    CHOP-662
 Stevex Janus
 	VWR-1182
 Still Defiant
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;
 		}
 
-- 
GitLab