summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEVELOPING.md2
-rw-r--r--http/http_client.hpp2
-rw-r--r--http/timer_queue.h2
-rw-r--r--http/utility.h2
-rw-r--r--include/dbus_monitor.hpp2
-rw-r--r--include/ibm/locks.hpp14
-rw-r--r--include/kvm_websocket.hpp2
-rw-r--r--include/openbmc_dbus_rest.hpp4
-rw-r--r--src/base64.cpp2
-rw-r--r--src/kvm_websocket_test.cpp2
-rw-r--r--static/redfish/v1/JsonSchemas/OemManager/index.json24
-rw-r--r--static/redfish/v1/schema/OemManager_v1.xml24
12 files changed, 41 insertions, 41 deletions
diff --git a/DEVELOPING.md b/DEVELOPING.md
index b8a2a26a6d..8c7ceabb5c 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -219,7 +219,7 @@
## clang-tidy
clang-tidy is a tool that can be used to identify coding style violations, bad
-design patterns, and bug prone contructs. It's not guaranteed that all tests
+design patterns, and bug prone constructs. It's not guaranteed that all tests
pass, but ideally should be run on new code to find issues. To run, make sure
you have clang++-9 installed, and clang-tidy-9 installed, and run. the -checks
field can be modified to enable or disable which clang-tidy checks are run.
diff --git a/http/http_client.hpp b/http/http_client.hpp
index 58086dd974..e6a7db1e04 100644
--- a/http/http_client.hpp
+++ b/http/http_client.hpp
@@ -197,7 +197,7 @@ class HttpClient : public std::enable_shared_from_this<HttpClient>
if (requestDataQueue.empty())
{
// TODO: Having issue in keeping connection alive. So lets close if
- // nothing to be trasferred.
+ // nothing to be transferred.
doClose();
BMCWEB_LOG_DEBUG << "requestDataQueue is empty\n";
diff --git a/http/timer_queue.h b/http/timer_queue.h
index f2a933b79a..d83cd0e229 100644
--- a/http/timer_queue.h
+++ b/http/timer_queue.h
@@ -65,7 +65,7 @@ class TimerQueue
}
BMCWEB_LOG_DEBUG << "timer call: " << this << ' ' << step;
- // we know that timer handlers are very simple currenty; call
+ // we know that timer handlers are very simple currently; call
// here
x.second();
}
diff --git a/http/utility.h b/http/utility.h
index 59abc8ddd1..4792f6fb40 100644
--- a/http/utility.h
+++ b/http/utility.h
@@ -670,7 +670,7 @@ inline bool base64Decode(const std::string_view input, std::string& output)
output.reserve(((inputLength + 2) / 3) * 4);
// for each 4-bytes sequence from the input, extract 4 6-bits sequences by
- // droping first two bits
+ // dropping first two bits
// and regenerate into 3 8-bits sequences
for (size_t i = 0; i < inputLength; i++)
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index 4cc5b064ad..9e22b9c66b 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -130,7 +130,7 @@ void requestRoutes(Crow<Middlewares...>& app)
.onmessage([&](crow::websocket::Connection& conn,
const std::string& data, bool is_binary) {
DbusWebsocketSession& thisSession = sessions[&conn];
- BMCWEB_LOG_DEBUG << "Connection " << &conn << " recevied " << data;
+ BMCWEB_LOG_DEBUG << "Connection " << &conn << " received " << data;
nlohmann::json j = nlohmann::json::parse(data, nullptr, false);
if (j.is_discarded())
{
diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp
index 6e9421f988..cb9191f252 100644
--- a/include/ibm/locks.hpp
+++ b/include/ibm/locks.hpp
@@ -149,7 +149,7 @@ class Lock
* This function implements the logic for acquiring a lock on a
* resource if the incoming request is legitimate without any
* conflicting requirements & without any conflicting requirement
- * with the exsiting locks in the lock table.
+ * with the existing locks in the lock table.
*
*/
@@ -387,7 +387,7 @@ inline void Lock::releaseLock(const ListOfTransactionIds& refRids)
else
{
BMCWEB_LOG_DEBUG << "Removing the locks from the lock table "
- "failed, tranasction ID: "
+ "failed, transaction ID: "
<< id;
}
}
@@ -469,7 +469,7 @@ inline bool Lock::validateRids(const ListOfTransactionIds& refRids)
}
else
{
- BMCWEB_LOG_DEBUG << "Atleast 1 inValid Request id";
+ BMCWEB_LOG_DEBUG << "At least 1 inValid Request id";
return false;
}
}
@@ -496,7 +496,7 @@ inline bool Lock::isValidLockRequest(const LockRequest refLockRecord)
if ((static_cast<int>(std::get<4>(refLockRecord).size()) > 6) ||
(static_cast<int>(std::get<4>(refLockRecord).size()) < 2))
{
- BMCWEB_LOG_DEBUG << "Validation of Number of Segements Failed";
+ BMCWEB_LOG_DEBUG << "Validation of Number of Segments Failed";
BMCWEB_LOG_DEBUG << "Number of Segments provied : "
<< sizeof(std::get<4>(refLockRecord));
return false;
@@ -642,11 +642,11 @@ inline bool Lock::isConflictRequest(const LockRequests refLockRequestStructure)
}
// This function converts the provided uint64_t resource id's from the two
-// lock requests subjected for comparision, and this function also compares
+// lock requests subjected for comparison, and this function also compares
// the content by bytes mentioned by a uint32_t number.
// If all the elements in the lock requests which are subjected for comparison
-// are same, then the last comparision would be to check for the respective
+// are same, then the last comparison would be to check for the respective
// bytes in the resourceid based on the segment length.
inline bool Lock::checkByte(uint64_t resourceId1, uint64_t resourceId2,
@@ -729,7 +729,7 @@ inline bool Lock::isConflictRecord(const LockRequest refLockRecord1,
// different resource So no conflict between the lock
// records.
// BMC is little endian , but the resourceID is formed by
- // the Managament Console in such a way that, the first byte
+ // the Management Console in such a way that, the first byte
// from the MSB Position corresponds to the First Segment
// data. Therefore we need to convert the in-comming
// resourceID into Big Endian before processing further.
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
index ed7c8cfedd..6db06fce0c 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -55,7 +55,7 @@ class KvmSession
<< " bytes from websocket";
boost::asio::buffer_copy(inputBuffer.prepare(data.size()),
boost::asio::buffer(data));
- BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Commiting " << data.size()
+ BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Committing " << data.size()
<< " bytes from websocket";
inputBuffer.commit(data.size());
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 456c768ab4..ea7dc951b2 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -2079,7 +2079,7 @@ void requestRoutes(Crow<Middlewares...>& app)
.requires({"Login"})
.methods("GET"_method)(
[](const crow::Request& req, crow::Response& res) {
- res.jsonValue = {{"busses", {{{"name", "system"}}}},
+ res.jsonValue = {{"buses", {{{"name", "system"}}}},
{"status", "ok"}};
res.end();
});
@@ -2253,7 +2253,7 @@ void requestRoutes(Crow<Middlewares...>& app)
if (it->find(".") != std::string::npos)
{
break;
- // This check is neccesary as the trailing slash gets
+ // This check is necessary as the trailing slash gets
// parsed as part of our <path> specifier above, which
// causes the normal trailing backslash redirector to
// fail.
diff --git a/src/base64.cpp b/src/base64.cpp
index 4b5cc264b7..e32090abda 100644
--- a/src/base64.cpp
+++ b/src/base64.cpp
@@ -99,7 +99,7 @@ bool base64_decode(const std::string& input, std::string& output)
output.reserve(((input_length + 2) / 3) * 4);
// for each 4-bytes sequence from the input, extract 4 6-bits sequences by
- // droping first two bits
+ // dropping first two bits
// and regenerate into 3 8-bits sequences
for (size_t i = 0; i < input_length; i++)
diff --git a/src/kvm_websocket_test.cpp b/src/kvm_websocket_test.cpp
index 07ca5151fd..4016329486 100644
--- a/src/kvm_websocket_test.cpp
+++ b/src/kvm_websocket_test.cpp
@@ -16,7 +16,7 @@ using namespace testing;
// Tests static files are loaded correctly
TEST(Kvm, BasicRfb)
{
- return; // TODO(ed) Make hte code below work again
+ return; // TODO(ed) Make the code below work again
SimpleApp app;
crow::kvm::requestRoutes(app);
diff --git a/static/redfish/v1/JsonSchemas/OemManager/index.json b/static/redfish/v1/JsonSchemas/OemManager/index.json
index 143f02b65e..e0be5b10b8 100644
--- a/static/redfish/v1/JsonSchemas/OemManager/index.json
+++ b/static/redfish/v1/JsonSchemas/OemManager/index.json
@@ -103,13 +103,13 @@
"type": "number"
},
"ILimitMax": {
- "description": "Integral limit maxiumum for the PID.",
- "longDescription": "Integral limit maxiumum for the PID.",
+ "description": "Integral limit maximum for the PID.",
+ "longDescription": "Integral limit maximum for the PID.",
"type": "number"
},
"ILimitMin": {
- "description": "Integral limit miniumum for the PID.",
- "longDescription": "Integral limit miniumum for the PID.",
+ "description": "Integral limit minimum for the PID.",
+ "longDescription": "Integral limit minimum for the PID.",
"type": "number"
},
"Inputs": {
@@ -129,8 +129,8 @@
"type": "number"
},
"OutLimitMax": {
- "description": "Output limit maxiumum for the pwm.",
- "longDescription": "Output limit maxiumum for the pwm.",
+ "description": "Output limit maximum for the pwm.",
+ "longDescription": "Output limit maximum for the pwm.",
"type": "number"
},
"OutLimitMin": {
@@ -358,13 +358,13 @@
"type": "number"
},
"ILimitMax": {
- "description": "Integral limit maxiumum for the PID.",
- "longDescription": "Integral limit maxiumum for the PID.",
+ "description": "Integral limit maximum for the PID.",
+ "longDescription": "Integral limit maximum for the PID.",
"type": "number"
},
"ILimitMin": {
- "description": "Integral limit miniumum for the PID.",
- "longDescription": "Integral limit miniumum for the PID.",
+ "description": "Integral limit minimum for the PID.",
+ "longDescription": "Integral limit minimum for the PID.",
"type": "number"
},
"Inputs": {
@@ -384,8 +384,8 @@
"type": "number"
},
"OutLimitMax": {
- "description": "Output limit maxiumum for the pwm.",
- "longDescription": "Output limit maxiumum for the pwm.",
+ "description": "Output limit maximum for the pwm.",
+ "longDescription": "Output limit maximum for the pwm.",
"type": "number"
},
"OutLimitMin": {
diff --git a/static/redfish/v1/schema/OemManager_v1.xml b/static/redfish/v1/schema/OemManager_v1.xml
index 4554db40bc..26498f09de 100644
--- a/static/redfish/v1/schema/OemManager_v1.xml
+++ b/static/redfish/v1/schema/OemManager_v1.xml
@@ -126,20 +126,20 @@
<Annotation Term="OData.LongDescription" String="Integral Coefficient for the PID." />
</Property>
<Property Name="ILimitMax" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Integral limit maxiumum for the PID." />
- <Annotation Term="OData.LongDescription" String="Integral limit maxiumum for the PID." />
+ <Annotation Term="OData.Description" String="Integral limit maximum for the PID." />
+ <Annotation Term="OData.LongDescription" String="Integral limit maximum for the PID." />
</Property>
<Property Name="ILimitMin" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Integral limit miniumum for the PID." />
- <Annotation Term="OData.LongDescription" String="Integral limit miniumum for the PID." />
+ <Annotation Term="OData.Description" String="Integral limit minimum for the PID." />
+ <Annotation Term="OData.LongDescription" String="Integral limit minimum for the PID." />
</Property>
<Property Name="Inputs" Type="Collection(Edm.String)">
<Annotation Term="OData.Description" String="Input sensors to the PID controller."/>
<Annotation Term="OData.LongDescription" String="Input sensors to the PID controller."/>
</Property>
<Property Name="OutLimitMax" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Output limit maxiumum for the pwm." />
- <Annotation Term="OData.LongDescription" String="Output limit maxiumum for the pwm." />
+ <Annotation Term="OData.Description" String="Output limit maximum for the pwm." />
+ <Annotation Term="OData.LongDescription" String="Output limit maximum for the pwm." />
</Property>
<Property Name="OutLimitMin" Type="Edm.Decimal" Nullable="false">
<Annotation Term="OData.Description" String="Output limit minimum for the pwm." />
@@ -210,20 +210,20 @@
<Annotation Term="OData.LongDescription" String="Integral Coefficient for the PID." />
</Property>
<Property Name="ILimitMax" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Integral limit maxiumum for the PID." />
- <Annotation Term="OData.LongDescription" String="Integral limit maxiumum for the PID." />
+ <Annotation Term="OData.Description" String="Integral limit maximum for the PID." />
+ <Annotation Term="OData.LongDescription" String="Integral limit maximum for the PID." />
</Property>
<Property Name="ILimitMin" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Integral limit miniumum for the PID." />
- <Annotation Term="OData.LongDescription" String="Integral limit miniumum for the PID." />
+ <Annotation Term="OData.Description" String="Integral limit minimum for the PID." />
+ <Annotation Term="OData.LongDescription" String="Integral limit minimum for the PID." />
</Property>
<Property Name="Inputs" Type="Collection(Edm.String)">
<Annotation Term="OData.Description" String="Input sensors to the PID controller."/>
<Annotation Term="OData.LongDescription" String="Input sensors to the PID controller."/>
</Property>
<Property Name="OutLimitMax" Type="Edm.Decimal" Nullable="false">
- <Annotation Term="OData.Description" String="Output limit maxiumum for the pwm." />
- <Annotation Term="OData.LongDescription" String="Output limit maxiumum for the pwm." />
+ <Annotation Term="OData.Description" String="Output limit maximum for the pwm." />
+ <Annotation Term="OData.LongDescription" String="Output limit maximum for the pwm." />
</Property>
<Property Name="OutLimitMin" Type="Edm.Decimal" Nullable="false">
<Annotation Term="OData.Description" String="Output limit minimum for the pwm." />
generated by cgit v1.2.3 (git 2.39.0) at 2024-06-01 15:04:06 +0300