summaryrefslogtreecommitdiff
path: root/src/mongo/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/util')
-rw-r--r--src/mongo/util/concurrency/mutex.h6
-rw-r--r--src/mongo/util/concurrency/rwlockimpl.cpp4
-rw-r--r--src/mongo/util/concurrency/simplerwlock.h2
-rw-r--r--src/mongo/util/hex.h2
-rw-r--r--src/mongo/util/net/hostandport.cpp6
-rw-r--r--src/mongo/util/net/hostandport.h6
-rw-r--r--src/mongo/util/password_digest.cpp4
-rw-r--r--src/mongo/util/password_digest.h4
-rw-r--r--src/mongo/util/stacktrace_posix.cpp2
-rw-r--r--src/mongo/util/string_map.h4
-rw-r--r--src/mongo/util/stringutils.cpp6
-rw-r--r--src/mongo/util/stringutils.h6
-rw-r--r--src/mongo/util/stringutils_test.cpp4
-rw-r--r--src/mongo/util/thread_safe_string.h2
-rw-r--r--src/mongo/util/time_support.cpp26
-rw-r--r--src/mongo/util/time_support.h2
16 files changed, 43 insertions, 43 deletions
diff --git a/src/mongo/util/concurrency/mutex.h b/src/mongo/util/concurrency/mutex.h
index 8ce3f1217c3..1e6de16c715 100644
--- a/src/mongo/util/concurrency/mutex.h
+++ b/src/mongo/util/concurrency/mutex.h
@@ -135,7 +135,7 @@ namespace mongo {
#if defined(_WIN32)
class SimpleMutex : boost::noncopyable {
public:
- SimpleMutex( const StringData& ) { InitializeCriticalSection( &_cs ); }
+ SimpleMutex( StringData ) { InitializeCriticalSection( &_cs ); }
void dassertLocked() const { }
void lock() { EnterCriticalSection( &_cs ); }
void unlock() { LeaveCriticalSection( &_cs ); }
@@ -154,7 +154,7 @@ namespace mongo {
class SimpleMutex : boost::noncopyable {
public:
void dassertLocked() const { }
- SimpleMutex(const StringData& name) { verify( pthread_mutex_init(&_lock,0) == 0 ); }
+ SimpleMutex(StringData name) { verify( pthread_mutex_init(&_lock,0) == 0 ); }
~SimpleMutex(){
if ( ! StaticObserver::_destroyingStatics ) {
verify( pthread_mutex_destroy(&_lock) == 0 );
@@ -182,7 +182,7 @@ namespace mongo {
*/
class RecursiveMutex : boost::noncopyable {
public:
- RecursiveMutex(const StringData& name) : m(name) { }
+ RecursiveMutex(StringData name) : m(name) { }
bool isLocked() const { return n.get() > 0; }
class scoped_lock : boost::noncopyable {
RecursiveMutex& rm;
diff --git a/src/mongo/util/concurrency/rwlockimpl.cpp b/src/mongo/util/concurrency/rwlockimpl.cpp
index 0ebb3e49da2..ea5eacebb28 100644
--- a/src/mongo/util/concurrency/rwlockimpl.cpp
+++ b/src/mongo/util/concurrency/rwlockimpl.cpp
@@ -52,7 +52,7 @@ using namespace std;
namespace mongo {
#if defined(NTDDI_VERSION) && defined(NTDDI_WIN7) && (NTDDI_VERSION >= NTDDI_WIN7)
- SimpleRWLock::SimpleRWLock(const StringData& p) : name(p.toString()) {
+ SimpleRWLock::SimpleRWLock(StringData p) : name(p.toString()) {
InitializeSRWLock(&_lock);
}
# if defined(_DEBUG)
@@ -103,7 +103,7 @@ namespace mongo {
}
# endif
#else
- SimpleRWLock::SimpleRWLock(const StringData& p) : name(p.toString()) { }
+ SimpleRWLock::SimpleRWLock(StringData p) : name(p.toString()) { }
void SimpleRWLock::lock() { m.lock(); }
void SimpleRWLock::unlock() { m.unlock(); }
void SimpleRWLock::lock_shared() { m.lock_shared(); }
diff --git a/src/mongo/util/concurrency/simplerwlock.h b/src/mongo/util/concurrency/simplerwlock.h
index 320a91c6e56..9803a97e4e0 100644
--- a/src/mongo/util/concurrency/simplerwlock.h
+++ b/src/mongo/util/concurrency/simplerwlock.h
@@ -51,7 +51,7 @@ namespace mongo {
#endif
public:
const std::string name;
- SimpleRWLock(const StringData& name = "" );
+ SimpleRWLock(StringData name = "" );
void lock();
void unlock();
void lock_shared();
diff --git a/src/mongo/util/hex.h b/src/mongo/util/hex.h
index 08e182e31e6..d9724986008 100644
--- a/src/mongo/util/hex.h
+++ b/src/mongo/util/hex.h
@@ -49,7 +49,7 @@ namespace mongo {
inline char fromHex( const char *c ) {
return (char)(( fromHex( c[ 0 ] ) << 4 ) | fromHex( c[ 1 ] ));
}
- inline char fromHex( const StringData& c ) {
+ inline char fromHex( StringData c ) {
return (char)(( fromHex( c[ 0 ] ) << 4 ) | fromHex( c[ 1 ] ));
}
diff --git a/src/mongo/util/net/hostandport.cpp b/src/mongo/util/net/hostandport.cpp
index 8d906c91264..25455bd7b6f 100644
--- a/src/mongo/util/net/hostandport.cpp
+++ b/src/mongo/util/net/hostandport.cpp
@@ -41,7 +41,7 @@
namespace mongo {
- StatusWith<HostAndPort> HostAndPort::parse(const StringData& text) {
+ StatusWith<HostAndPort> HostAndPort::parse(StringData text) {
HostAndPort result;
Status status = result.initialize(text);
if (!status.isOK()) {
@@ -52,7 +52,7 @@ namespace mongo {
HostAndPort::HostAndPort() : _port(-1) {}
- HostAndPort::HostAndPort(const StringData& text) {
+ HostAndPort::HostAndPort(StringData text) {
uassertStatusOK(initialize(text));
}
@@ -105,7 +105,7 @@ namespace mongo {
return _host.empty() && _port < 0;
}
- Status HostAndPort::initialize(const StringData& s) {
+ Status HostAndPort::initialize(StringData s) {
size_t colonPos = s.rfind(':');
StringData hostPart = s.substr(0, colonPos);
diff --git a/src/mongo/util/net/hostandport.h b/src/mongo/util/net/hostandport.h
index 9f0a9de39ee..7ea3e84ddbf 100644
--- a/src/mongo/util/net/hostandport.h
+++ b/src/mongo/util/net/hostandport.h
@@ -51,7 +51,7 @@ namespace mongo {
* Parses "text" to produce a HostAndPort. Returns either that or an error
* status describing the parse failure.
*/
- static StatusWith<HostAndPort> parse(const StringData& text);
+ static StatusWith<HostAndPort> parse(StringData text);
/**
* Construct an empty/invalid HostAndPort.
@@ -62,7 +62,7 @@ namespace mongo {
* Constructs a HostAndPort by parsing "text" of the form hostname[:portnumber]
* Throws an AssertionException if bad config std::string or bad port #.
*/
- explicit HostAndPort(const StringData& text);
+ explicit HostAndPort(StringData text);
/**
* Constructs a HostAndPort with the hostname "h" and port "p".
@@ -77,7 +77,7 @@ namespace mongo {
* after initialize() returns a non-OK status, though it is safe to
* assign to it or re-initialize it.
*/
- Status initialize(const StringData& s);
+ Status initialize(StringData s);
bool operator<(const HostAndPort& r) const;
bool operator==(const HostAndPort& r) const;
diff --git a/src/mongo/util/password_digest.cpp b/src/mongo/util/password_digest.cpp
index a7bee51ef9a..6bcdc633ef8 100644
--- a/src/mongo/util/password_digest.cpp
+++ b/src/mongo/util/password_digest.cpp
@@ -32,8 +32,8 @@
namespace mongo {
- std::string createPasswordDigest(const StringData& username,
- const StringData& clearTextPassword) {
+ std::string createPasswordDigest(StringData username,
+ StringData clearTextPassword) {
md5digest d;
{
diff --git a/src/mongo/util/password_digest.h b/src/mongo/util/password_digest.h
index d2fe1834568..434bbf819b9 100644
--- a/src/mongo/util/password_digest.h
+++ b/src/mongo/util/password_digest.h
@@ -39,8 +39,8 @@ namespace mongo {
* Hashes the password so that it can be stored in a user object or used for MONGODB-CR
* authentication.
*/
- std::string createPasswordDigest(const StringData& username,
- const StringData& clearTextPassword);
+ std::string createPasswordDigest(StringData username,
+ StringData clearTextPassword);
} // namespace mongo
diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp
index 0df11bceb68..95c43f84fce 100644
--- a/src/mongo/util/stacktrace_posix.cpp
+++ b/src/mongo/util/stacktrace_posix.cpp
@@ -60,7 +60,7 @@ namespace {
*
* E.g., for "/foo/bar/my.txt", returns "my.txt".
*/
- StringData getBaseName(const StringData& path) {
+ StringData getBaseName(StringData path) {
size_t lastSlash = path.rfind('/');
if (lastSlash == std::string::npos)
return path;
diff --git a/src/mongo/util/string_map.h b/src/mongo/util/string_map.h
index 60293ff915c..4a79c209d0e 100644
--- a/src/mongo/util/string_map.h
+++ b/src/mongo/util/string_map.h
@@ -37,7 +37,7 @@ namespace mongo {
typedef StringData::Hasher StringMapDefaultHash;
struct StringMapDefaultEqual {
- bool operator()( const StringData& a, const StringData& b ) const {
+ bool operator()( StringData a, StringData b ) const {
return a == b;
}
};
@@ -49,7 +49,7 @@ namespace mongo {
};
struct StringMapDefaultConvertorOther {
- std::string operator()( const StringData& s ) const {
+ std::string operator()( StringData s ) const {
return s.toString();
}
};
diff --git a/src/mongo/util/stringutils.cpp b/src/mongo/util/stringutils.cpp
index 2ea6dd41a91..e8a4750032d 100644
--- a/src/mongo/util/stringutils.cpp
+++ b/src/mongo/util/stringutils.cpp
@@ -61,7 +61,7 @@ namespace mongo {
_lexOnly( lexOnly ) {
}
- int LexNumCmp::cmp( const StringData& sd1, const StringData& sd2, bool lexOnly ) {
+ int LexNumCmp::cmp( StringData sd1, StringData sd2, bool lexOnly ) {
bool startWord = true;
size_t s1 = 0;
@@ -156,10 +156,10 @@ namespace mongo {
return 0;
}
- int LexNumCmp::cmp( const StringData& s1, const StringData& s2 ) const {
+ int LexNumCmp::cmp( StringData s1, StringData s2 ) const {
return cmp( s1, s2, _lexOnly );
}
- bool LexNumCmp::operator()( const StringData& s1, const StringData& s2 ) const {
+ bool LexNumCmp::operator()( StringData s1, StringData s2 ) const {
return cmp( s1, s2 ) < 0;
}
diff --git a/src/mongo/util/stringutils.h b/src/mongo/util/stringutils.h
index acf615bf4ff..c57205b4160 100644
--- a/src/mongo/util/stringutils.h
+++ b/src/mongo/util/stringutils.h
@@ -72,9 +72,9 @@ namespace mongo {
* For convenience, character 255 is greater than anything else.
* @param lexOnly - compare all characters lexically, including digits.
*/
- static int cmp( const StringData& s1, const StringData& s2, bool lexOnly );
- int cmp( const StringData& s1, const StringData& s2 ) const;
- bool operator()( const StringData& s1, const StringData& s2 ) const;
+ static int cmp( StringData s1, StringData s2, bool lexOnly );
+ int cmp( StringData s1, StringData s2 ) const;
+ bool operator()( StringData s1, StringData s2 ) const;
private:
bool _lexOnly;
};
diff --git a/src/mongo/util/stringutils_test.cpp b/src/mongo/util/stringutils_test.cpp
index 12a93c7c8f6..628ee601a36 100644
--- a/src/mongo/util/stringutils_test.cpp
+++ b/src/mongo/util/stringutils_test.cpp
@@ -64,8 +64,8 @@ namespace mongo {
}
void assertCmp( int expected,
- const StringData& s1,
- const StringData& s2,
+ StringData s1,
+ StringData s2,
bool lexOnly = false ) {
mongo::LexNumCmp cmp( lexOnly );
ASSERT_EQUALS( expected, cmp.cmp( s1, s2, lexOnly ) );
diff --git a/src/mongo/util/thread_safe_string.h b/src/mongo/util/thread_safe_string.h
index e80ea305e7c..b34315c1967 100644
--- a/src/mongo/util/thread_safe_string.h
+++ b/src/mongo/util/thread_safe_string.h
@@ -57,7 +57,7 @@ namespace mongo {
return _buf;
}
- ThreadSafeString& operator=( const StringData& str ) {
+ ThreadSafeString& operator=( StringData str ) {
size_t s = str.size();
if ( s >= _size - 2 )
s = _size - 2;
diff --git a/src/mongo/util/time_support.cpp b/src/mongo/util/time_support.cpp
index 32a3ae3c2dc..32ece8b73d8 100644
--- a/src/mongo/util/time_support.cpp
+++ b/src/mongo/util/time_support.cpp
@@ -247,8 +247,8 @@ namespace {
}
namespace {
- StringData getNextToken(const StringData& currentString,
- const StringData& terminalChars,
+ StringData getNextToken(StringData currentString,
+ StringData terminalChars,
size_t startIndex,
size_t* endIndex) {
size_t index = startIndex;
@@ -275,7 +275,7 @@ namespace {
}
// Check to make sure that the string only consists of digits
- bool isOnlyDigits(const StringData& toCheck) {
+ bool isOnlyDigits(StringData toCheck) {
StringData digits("0123456789");
for (StringData::const_iterator iterator = toCheck.begin();
iterator != toCheck.end(); iterator++) {
@@ -286,7 +286,7 @@ namespace {
return true;
}
- Status parseTimeZoneFromToken(const StringData& tzStr, int* tzAdjSecs) {
+ Status parseTimeZoneFromToken(StringData tzStr, int* tzAdjSecs) {
*tzAdjSecs = 0;
@@ -361,7 +361,7 @@ namespace {
}
Status parseMillisFromToken(
- const StringData& millisStr,
+ StringData millisStr,
int* resultMillis) {
*resultMillis = 0;
@@ -401,12 +401,12 @@ namespace {
}
Status parseTmFromTokens(
- const StringData& yearStr,
- const StringData& monthStr,
- const StringData& dayStr,
- const StringData& hourStr,
- const StringData& minStr,
- const StringData& secStr,
+ StringData yearStr,
+ StringData monthStr,
+ StringData dayStr,
+ StringData hourStr,
+ StringData minStr,
+ StringData secStr,
std::tm* resultTm) {
memset(resultTm, 0, sizeof(*resultTm));
@@ -530,7 +530,7 @@ namespace {
return Status::OK();
}
- Status parseTm(const StringData& dateString,
+ Status parseTm(StringData dateString,
std::tm* resultTm,
int* resultMillis,
int* tzAdjSecs) {
@@ -624,7 +624,7 @@ namespace {
} // namespace
- StatusWith<Date_t> dateFromISOString(const StringData& dateString) {
+ StatusWith<Date_t> dateFromISOString(StringData dateString) {
std::tm theTime;
int millis = 0;
int tzAdjSecs = 0;
diff --git a/src/mongo/util/time_support.h b/src/mongo/util/time_support.h
index f7e62476eb8..44fecdb25e1 100644
--- a/src/mongo/util/time_support.h
+++ b/src/mongo/util/time_support.h
@@ -107,7 +107,7 @@ namespace mongo {
*
* Local times are currently not supported.
*/
- StatusWith<Date_t> dateFromISOString(const StringData& dateString);
+ StatusWith<Date_t> dateFromISOString(StringData dateString);
/**
* Like dateToISOStringUTC, except outputs to a std::ostream.
View Lorry Controller Status