Skip to content

Commit b39e746

Browse files
Spell check fixes (sonic-net#783)
1 parent 373be80 commit b39e746

24 files changed

+55
-55
lines changed

lib/src/NotificationFactory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ std::shared_ptr<Notification> NotificationFactory::deserialize(
3131
if (name == SAI_SWITCH_NOTIFICATION_NAME_SWITCH_STATE_CHANGE)
3232
return std::make_shared<NotificationSwitchStateChange>(serializedNotification);
3333

34-
SWSS_LOG_ERROR("unknow notification: '%s', FIXME", name.c_str());
34+
SWSS_LOG_ERROR("unknown notification: '%s', FIXME", name.c_str());
3535

3636
return nullptr;
3737
}

lib/src/RedisRemoteSaiInterface.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ sai_status_t RedisRemoteSaiInterface::waitForQueryAattributeEnumValuesCapability
11021102
const std::string &capability_str = fvValue(values[0]);
11031103
const uint32_t num_capabilities = std::stoi(fvValue(values[1]));
11041104

1105-
SWSS_LOG_DEBUG("Received payload: capabilites = '%s', count = %d", capability_str.c_str(), num_capabilities);
1105+
SWSS_LOG_DEBUG("Received payload: capabilities = '%s', count = %d", capability_str.c_str(), num_capabilities);
11061106

11071107
enumValuesCapability->count = num_capabilities;
11081108

@@ -1119,7 +1119,7 @@ sai_status_t RedisRemoteSaiInterface::waitForQueryAattributeEnumValuesCapability
11191119
{
11201120
if (num_capabilities != i + 1)
11211121
{
1122-
SWSS_LOG_WARN("Query returned less attributes than expected: expected %d, recieved %d", num_capabilities, i+1);
1122+
SWSS_LOG_WARN("Query returned less attributes than expected: expected %d, received %d", num_capabilities, i+1);
11231123
}
11241124

11251125
break;
@@ -1897,7 +1897,7 @@ sai_status_t RedisRemoteSaiInterface::sai_redis_notify_syncd(
18971897

18981898
case SAI_REDIS_NOTIFY_SYNCD_INSPECT_ASIC:
18991899

1900-
SWSS_LOG_NOTICE("inspec ASIC SUCCEEDED");
1900+
SWSS_LOG_NOTICE("inspect ASIC SUCCEEDED");
19011901

19021902
break;
19031903

lib/src/VirtualObjectIdManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static_assert(SAI_REDIS_OBJECT_ID_BITS_SIZE == SAI_OBJECT_ID_BITS_SIZE, "redis o
4141
* This condition must be met, since we need to be able to encode SAI object
4242
* type in object id on defined number of bits.
4343
*/
44-
static_assert(SAI_OBJECT_TYPE_EXTENSIONS_MAX < SAI_REDIS_OBJECT_TYPE_MAX, "redis max object type value must be greater than supported SAI max objeect type value");
44+
static_assert(SAI_OBJECT_TYPE_EXTENSIONS_MAX < SAI_REDIS_OBJECT_TYPE_MAX, "redis max object type value must be greater than supported SAI max object type value");
4545

4646
/*
4747
* Current OBJECT ID format:
@@ -220,7 +220,7 @@ sai_object_id_t VirtualObjectIdManager::allocateNewObjectId(
220220

221221
if ((objectType <= SAI_OBJECT_TYPE_NULL) || (objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
222222
{
223-
SWSS_LOG_THROW("invalid objct type: %d", objectType);
223+
SWSS_LOG_THROW("invalid object type: %d", objectType);
224224
}
225225

226226
if (objectType == SAI_OBJECT_TYPE_SWITCH)

lib/src/ZeroMQChannel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void ZeroMQChannel::notificationThreadFunction()
162162

163163
if (rc >= ZMQ_RESPONSE_BUFFER_SIZE)
164164
{
165-
SWSS_LOG_WARN("zmq_recv message was turncated (over %d bytes, received %d), increase buffer size, message DROPPED",
165+
SWSS_LOG_WARN("zmq_recv message was truncated (over %d bytes, received %d), increase buffer size, message DROPPED",
166166
ZMQ_RESPONSE_BUFFER_SIZE,
167167
rc);
168168

@@ -299,7 +299,7 @@ sai_status_t ZeroMQChannel::wait(
299299

300300
if (rc >= ZMQ_RESPONSE_BUFFER_SIZE)
301301
{
302-
SWSS_LOG_THROW("zmq_recv message was turncated (over %d bytes, recived %d), increase buffer size, message DROPPED",
302+
SWSS_LOG_THROW("zmq_recv message was truncated (over %d bytes, received %d), increase buffer size, message DROPPED",
303303
ZMQ_RESPONSE_BUFFER_SIZE,
304304
rc);
305305
}

meta/AttrKeyMap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ std::string AttrKeyMap::constructKey(
126126
default:
127127

128128
// NOTE: only primitive types should be considered as keys
129-
SWSS_LOG_THROW("FATAL: atribute %s marked as key, but have invalid serialization type, FIXME",
129+
SWSS_LOG_THROW("FATAL: attribute %s marked as key, but have invalid serialization type, FIXME",
130130
md->attridname);
131131
}
132132

meta/Meta.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2587,7 +2587,7 @@ sai_status_t Meta::bulkCreate(
25872587
{
25882588
if (attr_list[idx] == nullptr)
25892589
{
2590-
SWSS_LOG_ERROR("pointer to attr list at ondex %u is NULL", idx);
2590+
SWSS_LOG_ERROR("pointer to attribute list at index %u is NULL", idx);
25912591

25922592
return SAI_STATUS_INVALID_PARAMETER;
25932593
}
@@ -3059,7 +3059,7 @@ bool Meta::meta_is_object_in_default_state(
30593059

30603060
if (!m_oids.objectReferenceExists(oid))
30613061
{
3062-
SWSS_LOG_WARN("object %s refrence not exists, bug!",
3062+
SWSS_LOG_WARN("object %s reference not exists, bug!",
30633063
sai_serialize_object_id(oid).c_str());
30643064
return false;
30653065
}
@@ -4917,7 +4917,7 @@ sai_status_t Meta::meta_generic_validation_set(
49174917
{
49184918
if (meta_unittests_get_and_erase_set_readonly_flag(md))
49194919
{
4920-
META_LOG_NOTICE(md, "readonly attribute is allowd to be set (unittests enabled)");
4920+
META_LOG_NOTICE(md, "readonly attribute is allowed to be set (unittests enabled)");
49214921
}
49224922
else
49234923
{
@@ -7222,7 +7222,7 @@ void Meta::meta_sai_on_fdb_event_single(
72227222

72237223
if (m_saiObjectCollection.objectExists(meta_key_fdb))
72247224
{
7225-
SWSS_LOG_WARN("object key %s alearedy exists, but received LEARNED event",
7225+
SWSS_LOG_WARN("object key %s already exists, but received LEARNED event",
72267226
sai_serialize_object_meta_key(meta_key_fdb).c_str());
72277227
break;
72287228
}
@@ -7312,7 +7312,7 @@ void Meta::meta_sai_on_fdb_event_single(
73127312

73137313
if (status != SAI_STATUS_SUCCESS)
73147314
{
7315-
SWSS_LOG_ERROR("object key %s FDB MOVE event, SET validateion failed on attr.id = %d",
7315+
SWSS_LOG_ERROR("object key %s FDB MOVE event, SET validation failed on attr.id = %d",
73167316
sai_serialize_object_meta_key(meta_key_fdb).c_str(),
73177317
attr.id);
73187318
continue;

meta/OidRefCounter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bool OidRefCounter::objectReferenceExists(
2020

2121
bool exists = m_hash.find(oid) != m_hash.end();
2222

23-
SWSS_LOG_DEBUG("object 0x%" PRIx64 " refrence: %s", oid, exists ? "exists" : "missing");
23+
SWSS_LOG_DEBUG("object 0x%" PRIx64 " reference: %s", oid, exists ? "exists" : "missing");
2424

2525
return exists;
2626
}

meta/saiserialize.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ std::string sai_serialize_l2mc_entry(
815815
j["bv_id"] = sai_serialize_object_id(l2mc_entry.bv_id);
816816
j["type"] = sai_serialize_l2mc_entry_type(l2mc_entry.type);
817817
j["destination"] = sai_serialize_ip_address(l2mc_entry.destination);
818-
j["sourte"] = sai_serialize_ip_address(l2mc_entry.source);
818+
j["source"] = sai_serialize_ip_address(l2mc_entry.source);
819819

820820
return j.dump();
821821
}
@@ -3018,7 +3018,7 @@ void sai_deserialize_attr_value(
30183018
return sai_deserialize_system_port_config_list(s, attr.value.sysportconfiglist, countOnly);
30193019

30203020
default:
3021-
SWSS_LOG_THROW("deserialize type %d is not supportd yet FIXME", meta.attrvaluetype);
3021+
SWSS_LOG_THROW("deserialize type %d is not supported yet FIXME", meta.attrvaluetype);
30223022
}
30233023
}
30243024

meta/tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1876,7 +1876,7 @@ void test_route_entry_create()
18761876
status = g_meta->create(&route_entry, 3, list2);
18771877
META_ASSERT_FAIL(status);
18781878

1879-
SWSS_LOG_NOTICE("wrong obejct type");
1879+
SWSS_LOG_NOTICE("wrong object type");
18801880
attr1.value.oid = create_dummy_object_id(SAI_OBJECT_TYPE_HASH,switch_id);
18811881
status = g_meta->create(&route_entry, 2, list);
18821882
META_ASSERT_FAIL(status);

syncd/AsicView.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void AsicView::bindNewVidReference(
339339

340340
int referenceCount = ++(it->second);
341341

342-
SWSS_LOG_INFO("increased vid %s refrence to %d",
342+
SWSS_LOG_INFO("increased vid %s reference to %d",
343343
sai_serialize_object_id(vid).c_str(),
344344
referenceCount);
345345
}
@@ -954,7 +954,7 @@ std::vector<AsicOperation> AsicView::asicGetWithOptimizedRemoveOperations() cons
954954

955955
if (op.m_vid == SAI_NULL_OBJECT_ID)
956956
{
957-
SWSS_LOG_THROW("non object id remove not exected here");
957+
SWSS_LOG_THROW("non object id remove not expected here");
958958
}
959959

960960
auto mit = m_vidToAsicOperationId.find(op.m_vid);
@@ -1251,7 +1251,7 @@ void AsicView::updateNonObjectIdVidReferenceCountByValue(
12511251

12521252
if (m_enableRefernceCountLogs)
12531253
{
1254-
SWSS_LOG_WARN("updated vid %s refrence to %d",
1254+
SWSS_LOG_WARN("updated vid %s reference to %d",
12551255
sai_serialize_object_id(vid).c_str(),
12561256
m_vidReference[vid]);
12571257
}

syncd/BestCandidateFinder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3028,7 +3028,7 @@ bool BestCandidateFinder::exchangeTemporaryVidToCurrentVid(
30283028
* This is just sanity check, should never happen.
30293029
*/
30303030

3031-
SWSS_LOG_THROW("found tempoary RID %s but current VID doesn't exist, FATAL",
3031+
SWSS_LOG_THROW("found temporary RID %s but current VID doesn't exist, FATAL",
30323032
sai_serialize_object_id(temporaryRid).c_str());
30333033
}
30343034

syncd/ComparisonLogic.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2923,15 +2923,15 @@ void ComparisonLogic::logViewObjectCount(
29232923

29242924
asic_changes = true;
29252925

2926-
SWSS_LOG_WARN("object count for %s on current view %zu is differnt than on temporary view: %zu",
2926+
SWSS_LOG_WARN("object count for %s on current view %zu is different than on temporary view: %zu",
29272927
sai_serialize_object_type(ot).c_str(),
29282928
c,
29292929
t);
29302930
}
29312931

29322932
if (asic_changes)
29332933
{
2934-
SWSS_LOG_WARN("object count is differnt on both view, there will be ASIC OPERATIONS!");
2934+
SWSS_LOG_WARN("object count is different on both view, there will be ASIC OPERATIONS!");
29352935
}
29362936
}
29372937

@@ -3498,7 +3498,7 @@ void ComparisonLogic::executeOperationsOnAsic()
34983498
throw;
34993499
}
35003500

3501-
SWSS_LOG_NOTICE("performed all operations on asic succesfully");
3501+
SWSS_LOG_NOTICE("performed all operations on asic successfully");
35023502
}
35033503

35043504
void ComparisonLogic::checkMap(

syncd/NotificationProcessor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void NotificationProcessor::sendNotification(
4747

4848
m_notifications->send(op, data, entry);
4949

50-
SWSS_LOG_DEBUG("notification send successfull");
50+
SWSS_LOG_DEBUG("notification send successfully");
5151
}
5252

5353
void NotificationProcessor::sendNotification(
@@ -545,7 +545,7 @@ void NotificationProcessor::syncProcessNotification(
545545
}
546546
else
547547
{
548-
SWSS_LOG_ERROR("unknow notification: %s", notification.c_str());
548+
SWSS_LOG_ERROR("unknown notification: %s", notification.c_str());
549549
}
550550
}
551551

syncd/RedisClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ void RedisClient::processFlushEvent(
885885
break;
886886

887887
default:
888-
SWSS_LOG_THROW("unknow fdb flush entry type: %d", type);
888+
SWSS_LOG_THROW("unknown fdb flush entry type: %d", type);
889889
}
890890

891891
for (int flush_static: vals)

syncd/RequestShutdownCommandLineOptionsParser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void RequestShutdownCommandLineOptionsParser::printUsage()
9292
{
9393
SWSS_LOG_ENTER();
9494

95-
std::cout << "Usage: syncd_request_shutdown [-w] [--wram] [-p] [--pre] [-c] [--cold] [-f] [--fast] [-g idx] [-x contextConfig]" << std::endl;
95+
std::cout << "Usage: syncd_request_shutdown [-w] [--warm] [-p] [--pre] [-c] [--cold] [-f] [--fast] [-g idx] [-x contextConfig]" << std::endl;
9696

9797
std::cerr << std::endl;
9898

syncd/SaiAttr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ std::vector<sai_object_id_t> SaiAttr::getOidListFromAttribute() const
196196

197197
if (m_meta->isoidattribute)
198198
{
199-
SWSS_LOG_THROW("attribute %s is oid attrubute but not handled", m_meta->attridname);
199+
SWSS_LOG_THROW("attribute %s is oid attribute but not handled", m_meta->attridname);
200200
}
201201

202202
// Attribute not contain any object ids.

syncd/SingleReiniter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ void SingleReiniter::listFailedAttributes(
590590

591591
if (meta == NULL)
592592
{
593-
SWSS_LOG_ERROR("failed to get atribute metadata %s %d",
593+
SWSS_LOG_ERROR("failed to get attribute metadata %s %d",
594594
sai_serialize_object_type(objectType).c_str(),
595595
attr->id);
596596

@@ -751,7 +751,7 @@ sai_object_id_t SingleReiniter::processSingleVid(
751751

752752
if (meta == NULL)
753753
{
754-
SWSS_LOG_THROW("failed to get atribute metadata %s: %d",
754+
SWSS_LOG_THROW("failed to get attribute metadata %s: %d",
755755
sai_serialize_object_type(objectType).c_str(),
756756
attr->id);
757757
}
@@ -760,7 +760,7 @@ sai_object_id_t SingleReiniter::processSingleVid(
760760
if (meta->objecttype == SAI_OBJECT_TYPE_SWITCH &&
761761
attr->id == SAI_SWITCH_ATTR_SRC_MAC_ADDRESS)
762762
{
763-
SWSS_LOG_WARN("skipping to set MAC addres since not supported on mlnx 2700");
763+
SWSS_LOG_WARN("skipping to set MAC address since not supported on Mellanox platforms");
764764
continue;
765765
}
766766

syncd/Syncd.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Syncd::Syncd(
7575

7676
if (m_commandLineOptions->m_enableSyncMode)
7777
{
78-
SWSS_LOG_WARN("enable sync mode is depreacated, please use communication mode, FORCING redis sync mode");
78+
SWSS_LOG_WARN("enable sync mode is deprecated, please use communication mode, FORCING redis sync mode");
7979

8080
m_enableSyncMode = true;
8181

@@ -216,7 +216,7 @@ void Syncd::performStartupLogic()
216216

217217
if (warmBootReadFile == NULL || access(warmBootReadFile, F_OK) == -1)
218218
{
219-
SWSS_LOG_WARN("user requested warmStart but warmBootReadFile is not specified or not accesible, forcing cold start");
219+
SWSS_LOG_WARN("user requested warmStart but warmBootReadFile is not specified or not accessible, forcing cold start");
220220

221221
m_commandLineOptions->m_startType = SAI_START_TYPE_COLD_BOOT;
222222
}
@@ -1176,7 +1176,7 @@ sai_status_t Syncd::processBulkEntry(
11761176

11771177
if (info->isobjectid)
11781178
{
1179-
SWSS_LOG_THROW("passing oid object to bulk non obejct id operation");
1179+
SWSS_LOG_THROW("passing oid object to bulk non object id operation");
11801180
}
11811181

11821182
std::vector<sai_status_t> statuses(objectIds.size());
@@ -1474,7 +1474,7 @@ sai_status_t Syncd::processBulkOid(
14741474

14751475
if (info->isnonobjectid)
14761476
{
1477-
SWSS_LOG_THROW("passing non object id to bulk oid obejct operation");
1477+
SWSS_LOG_THROW("passing non object id to bulk oid object operation");
14781478
}
14791479

14801480
std::vector<sai_status_t> statuses(objectIds.size());
@@ -3401,7 +3401,7 @@ sai_status_t Syncd::applyView()
34013401

34023402
if (!consistent && m_commandLineOptions->m_enableUnittests)
34033403
{
3404-
SWSS_LOG_THROW("ASIC content is differnt than DB content!");
3404+
SWSS_LOG_THROW("ASIC content is different than DB content!");
34053405
}
34063406
}
34073407
}
@@ -3728,7 +3728,7 @@ void Syncd::onSwitchCreateInInitViewMode(
37283728

37293729
if (currentHw != newHw)
37303730
{
3731-
SWSS_LOG_THROW("hardware info missmatch: current '%s' vs new '%s'", currentHw.c_str(), newHw.c_str());
3731+
SWSS_LOG_THROW("hardware info mismatch: current '%s' vs new '%s'", currentHw.c_str(), newHw.c_str());
37323732
}
37333733

37343734
SWSS_LOG_NOTICE("current %s switch hardware info: '%s'",
@@ -3843,7 +3843,7 @@ void Syncd::performWarmRestartSingleSwitch(
38433843
continue;
38443844
}
38453845

3846-
SWSS_LOG_NOTICE("skiping warm boot: %s", meta->attridname);
3846+
SWSS_LOG_NOTICE("skipping warm boot: %s", meta->attridname);
38473847
}
38483848

38493849
// TODO support multiple notification handlers
@@ -3897,7 +3897,7 @@ void Syncd::performWarmRestart()
38973897
SWSS_LOG_THROW("on warm restart there is no switches defined in DB, not supported yet, FIXME");
38983898
}
38993899

3900-
SWSS_LOG_NOTICE("switches defined in warm restat: %zu", entries.size());
3900+
SWSS_LOG_NOTICE("switches defined in warm restart: %zu", entries.size());
39013901

39023902
// here we could have multiple switches defined, let's process them one by one
39033903

@@ -3998,7 +3998,7 @@ void Syncd::sendShutdownRequestAfterException()
39983998
sendShutdownRequest(SAI_NULL_OBJECT_ID);
39993999
}
40004000

4001-
SWSS_LOG_NOTICE("notification send successfull");
4001+
SWSS_LOG_NOTICE("notification send successfully");
40024002
}
40034003
catch(const std::exception &e)
40044004
{
@@ -4344,7 +4344,7 @@ void Syncd::run()
43444344

43454345
s->addSelectable(m_restartQuery.get());
43464346

4347-
SWSS_LOG_NOTICE("switched to PRE_SHUTDOWN, from now on accepting only shurdown requests");
4347+
SWSS_LOG_NOTICE("switched to PRE_SHUTDOWN, from now on accepting only shutdown requests");
43484348
}
43494349
else
43504350
{

0 commit comments

Comments
 (0)