summaryrefslogtreecommitdiffstats
path: root/storage/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-08-12 22:35:04 +0200
committerHenning Baldersheim <balder@oath.com>2018-08-12 22:35:04 +0200
commitd38b49ddb881a67250ed738382d1ff72283cd45b (patch)
tree150bd862d7d66a2928b8b45773102ccedfb50eff /storage/src
parentfded37d945ca2539c96621b9ae33806ebbadf875 (diff)
Remove whitespace
Diffstat (limited to 'storage/src')
-rw-r--r--storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp4
-rw-r--r--storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h4
-rw-r--r--storage/src/vespa/storage/config/distributorconfiguration.h4
-rw-r--r--storage/src/vespa/storage/storageserver/fnetlistener.cpp2
-rw-r--r--storage/src/vespa/storage/storageserver/fnetlistener.h2
-rw-r--r--storage/src/vespa/storage/visiting/visitorthread.cpp2
-rw-r--r--storage/src/vespa/storage/visiting/visitorthread.h2
7 files changed, 10 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp
index 3dc23d8236b..aa985f282f1 100644
--- a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp
+++ b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp
@@ -30,7 +30,7 @@ vespalib::string stripWhitespace(const vespalib::string& s) {
return s.substr(start, stop - start + 1);
}
-vespalib::string getLine(vespalib::stringref key,
+vespalib::string getLine(vespalib::stringref key,
vespalib::stringref content)
{
vespalib::string::size_type start(0);
@@ -63,7 +63,7 @@ uint32_t getTokenCount(const vespalib::string& line) {
return st.size();
}
-uint64_t toLong(vespalib::stringref s, int base) {
+uint64_t toLong(vespalib::stringref s, int base) {
char* endptr;
// FIXME C++17 range-safe from_chars() instead of strtoull()
uint64_t result(strtoull(s.data(), &endptr, base));
diff --git a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h
index ec7cff41d9a..80a2b2738bc 100644
--- a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h
+++ b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h
@@ -15,14 +15,14 @@ vespalib::string readFile(const char* fileName);
vespalib::string stripWhitespace(const vespalib::string& s);
-vespalib::string getLine(vespalib::stringref key,
+vespalib::string getLine(vespalib::stringref key,
vespalib::stringref content);
vespalib::string getToken(uint32_t index, const vespalib::string& line);
uint32_t getTokenCount(const vespalib::string& line);
-uint64_t toLong(vespalib::stringref s, int base = 0) ;
+uint64_t toLong(vespalib::stringref s, int base = 0) ;
} /* namespace kernelmetrictool */
} /* namespace storage */
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h
index 8c2e0568796..5dfc4f66cb8 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.h
+++ b/storage/src/vespa/storage/config/distributorconfiguration.h
@@ -70,11 +70,11 @@ public:
_lastGarbageCollectionChange = lastChangeTime;
}
- bool stateCheckerIsActive(vespalib::stringref stateCheckerName) const {
+ bool stateCheckerIsActive(vespalib::stringref stateCheckerName) const {
return _blockedStateCheckers.find(stateCheckerName) == _blockedStateCheckers.end();
}
- void disableStateChecker(vespalib::stringref stateCheckerName) {
+ void disableStateChecker(vespalib::stringref stateCheckerName) {
_blockedStateCheckers.insert(stateCheckerName);
}
diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.cpp b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
index d92b672c52a..1a72190b2a6 100644
--- a/storage/src/vespa/storage/storageserver/fnetlistener.cpp
+++ b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
@@ -43,7 +43,7 @@ FNetListener::getListenPort() const
}
void
-FNetListener::registerHandle(vespalib::stringref handle) {
+FNetListener::registerHandle(vespalib::stringref handle) {
_slobrokRegister.registerName(handle);
while (_slobrokRegister.busy()) {
LOG(debug, "Waiting to register in slobrok");
diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.h b/storage/src/vespa/storage/storageserver/fnetlistener.h
index 2ffdae24b29..abcba18e0be 100644
--- a/storage/src/vespa/storage/storageserver/fnetlistener.h
+++ b/storage/src/vespa/storage/storageserver/fnetlistener.h
@@ -27,7 +27,7 @@ public:
void RPC_getCurrentTime(FRT_RPCRequest *req);
void RPC_setDistributionStates(FRT_RPCRequest* req);
- void registerHandle(vespalib::stringref handle);
+ void registerHandle(vespalib::stringref handle);
void close();
int getListenPort() const;
diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp
index f0374e07ef7..d5b56c3ee53 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthread.cpp
@@ -365,7 +365,7 @@ VisitorThread::handleNonExistingVisitorCall(const Event& entry,
* Utility function to get a visitor instance from a given library.
*/
std::shared_ptr<Visitor>
-VisitorThread::createVisitor(vespalib::stringref libName,
+VisitorThread::createVisitor(vespalib::stringref libName,
const vdslib::Parameters& params,
vespalib::asciistream & error)
{
diff --git a/storage/src/vespa/storage/visiting/visitorthread.h b/storage/src/vespa/storage/visiting/visitorthread.h
index 483837ed741..a9dcd8f5806 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.h
+++ b/storage/src/vespa/storage/visiting/visitorthread.h
@@ -125,7 +125,7 @@ private:
void trimRecentlyCompletedList(framework::SecondTime currentTime);
void handleNonExistingVisitorCall(const Event& entry, api::ReturnCode& code);
- std::shared_ptr<Visitor> createVisitor(vespalib::stringref libName,
+ std::shared_ptr<Visitor> createVisitor(vespalib::stringref libName,
const vdslib::Parameters& params,
vespalib::asciistream & error);