[saimeta]: Fix typo: > then -> >; don't exists -> doesn't exist (sonic-net#339)

Shuotian Cheng · web-flow · commit 7cd75c0f9f04 · 2018-08-26T00:32:58.000-07:00
Signed-off-by: Shu0T1an ChenG &lt;shuche@microsoft.com&gt;
diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp
@@ -457,7 +457,7 @@ void set_object(
 
     if (!object_exists(key))
     {
-        SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());
+        SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());
     }
 
     META_LOG_DEBUG(md, "set attribute %d on %s", attr->id, key.c_str());
@@ -474,7 +474,7 @@ const std::vector<std::shared_ptr<SaiAttrWrapper>> get_object_attributes(
 
     if (!object_exists(key))
     {
-        SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());
+        SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());
     }
 
     std::vector<std::shared_ptr<SaiAttrWrapper>> attrs;
@@ -498,7 +498,7 @@ void remove_object(
 
     if (!object_exists(key))
     {
-        SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());
+        SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());
     }
 
     SWSS_LOG_DEBUG("removing object %s", key.c_str());
@@ -533,7 +533,7 @@ sai_status_t meta_generic_validation_objlist(
 
     if (count > MAX_LIST_COUNT)
     {
-        META_LOG_ERROR(md, "object list count %u is > then max list count %u", count, MAX_LIST_COUNT);
+        META_LOG_ERROR(md, "object list count %u > max list count %u", count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -626,7 +626,7 @@ sai_status_t meta_generic_validation_objlist(
 
         if (!object_reference_exists(query_switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);
             return SAI_STATUS_INVALID_PARAMETER;
         }
 
@@ -652,7 +652,7 @@ sai_status_t meta_genetic_validation_list(
 
     if (count > MAX_LIST_COUNT)
     {
-        META_LOG_ERROR(md, "list count %u is > then max list count %u", count, MAX_LIST_COUNT);
+        META_LOG_ERROR(md, "list count %u > max list count %u", count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -924,7 +924,7 @@ sai_status_t meta_generic_validate_non_object_on_create(
 
         if (!object_reference_exists(oid_switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists", oid_switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", oid_switch_id);
 
             return SAI_STATUS_INVALID_PARAMETER;
         }
@@ -950,7 +950,7 @@ sai_status_t meta_generic_validation_create(
 
     if (attr_count > MAX_LIST_COUNT)
     {
-        SWSS_LOG_ERROR("create attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);
+        SWSS_LOG_ERROR("create attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -1002,14 +1002,14 @@ sai_status_t meta_generic_validation_create(
 
         if (!object_exists(switch_meta_key))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists yet", switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist yet", switch_id);
 
             return SAI_STATUS_INVALID_PARAMETER;
         }
 
         if (!object_reference_exists(switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists yet", switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist yet", switch_id);
 
             return SAI_STATUS_INVALID_PARAMETER;
         }
@@ -1691,7 +1691,7 @@ sai_status_t meta_generic_validation_remove(
 
     if (!object_reference_exists(oid))
     {
-        SWSS_LOG_ERROR("object 0x%lx reference don't exists", oid);
+        SWSS_LOG_ERROR("object 0x%lx reference doesn't exist", oid);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -1776,7 +1776,7 @@ sai_status_t meta_generic_validation_set(
 
         if (!object_reference_exists(switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists", switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", switch_id);
             return SAI_STATUS_INVALID_PARAMETER;
         }
     }
@@ -2150,7 +2150,7 @@ sai_status_t meta_generic_validation_get(
 
     if (attr_count > MAX_LIST_COUNT)
     {
-        SWSS_LOG_ERROR("get attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);
+        SWSS_LOG_ERROR("get attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -2452,7 +2452,7 @@ sai_status_t meta_generic_validation_get_stats(
 
     if (count > MAX_LIST_COUNT)
     {
-        SWSS_LOG_ERROR("get stats count is too large %u > then max list count %u", count, MAX_LIST_COUNT);
+        SWSS_LOG_ERROR("get stats count %u > max list count %u", count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -2558,7 +2558,7 @@ void meta_generic_validation_post_create(
 
                 if (!object_reference_exists(query_switch_id))
                 {
-                    SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);
+                    SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);
                     break;
                 }
 
@@ -3138,7 +3138,7 @@ void meta_generic_validation_post_get_objlist(
 
     if (count > MAX_LIST_COUNT)
     {
-        META_LOG_ERROR(md, "returned get object list count %u is > then max list count %u", count, MAX_LIST_COUNT);
+        META_LOG_ERROR(md, "returned get object list count %u > max list count %u", count, MAX_LIST_COUNT);
     }
 
     if (list == NULL)
@@ -3208,7 +3208,7 @@ void meta_generic_validation_post_get_objlist(
 
         if (!object_reference_exists(query_switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);
         }
 
         if (query_switch_id != switch_id)
@@ -3222,7 +3222,7 @@ void meta_generic_validation_post_get_objlist(
 {\
     if (list.count > MAX_LIST_COUNT)\
     {\
-        META_LOG_ERROR(md, "list count %u is > then max list count %u", list.count, MAX_LIST_COUNT);\
+        META_LOG_ERROR(md, "list count %u > max list count %u", list.count, MAX_LIST_COUNT);\
     }\
 }
 
@@ -4595,7 +4595,7 @@ sai_status_t meta_sai_get_oid(
 
         if (!object_reference_exists(switch_id))
         {
-            SWSS_LOG_ERROR("switch id 0x%lx don't exists", switch_id);
+            SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", switch_id);
         }
 
         meta_generic_validation_post_get(meta_key, switch_id, attr_count, attr_list);
@@ -4864,7 +4864,7 @@ sai_status_t meta_sai_flush_fdb_entries(
 
     if (attr_count > MAX_LIST_COUNT)
     {
-        SWSS_LOG_ERROR("create attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);
+        SWSS_LOG_ERROR("create attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);
 
         return SAI_STATUS_INVALID_PARAMETER;
     }
@@ -4889,7 +4889,7 @@ sai_status_t meta_sai_flush_fdb_entries(
 
     if (!object_reference_exists(switch_id))
     {
-        SWSS_LOG_ERROR("switch id %s don't exists",
+        SWSS_LOG_ERROR("switch id %s doesn't exist",
                 sai_serialize_object_id(switch_id).c_str());
 
         return SAI_STATUS_INVALID_PARAMETER;

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ void set_object(`
`457`	`457`
`458`	`458`	`if (!object_exists(key))`
`459`	`459`	`{`
`460`		`- SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());`
	`460`	`+ SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`META_LOG_DEBUG(md, "set attribute %d on %s", attr->id, key.c_str());`
`@@ -474,7 +474,7 @@ const std::vector<std::shared_ptr<SaiAttrWrapper>> get_object_attributes(`
`474`	`474`
`475`	`475`	`if (!object_exists(key))`
`476`	`476`	`{`
`477`		`- SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());`
	`477`	`+ SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());`
`478`	`478`	`}`
`479`	`479`
`480`	`480`	`std::vector<std::shared_ptr<SaiAttrWrapper>> attrs;`
`@@ -498,7 +498,7 @@ void remove_object(`
`498`	`498`
`499`	`499`	`if (!object_exists(key))`
`500`	`500`	`{`
`501`		`- SWSS_LOG_THROW("FATAL: object %s don't exists", key.c_str());`
	`501`	`+ SWSS_LOG_THROW("FATAL: object %s doesn't exist", key.c_str());`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`SWSS_LOG_DEBUG("removing object %s", key.c_str());`
`@@ -533,7 +533,7 @@ sai_status_t meta_generic_validation_objlist(`
`533`	`533`
`534`	`534`	`if (count > MAX_LIST_COUNT)`
`535`	`535`	`{`
`536`		`- META_LOG_ERROR(md, "object list count %u is > then max list count %u", count, MAX_LIST_COUNT);`
	`536`	`+ META_LOG_ERROR(md, "object list count %u > max list count %u", count, MAX_LIST_COUNT);`
`537`	`537`
`538`	`538`	`return SAI_STATUS_INVALID_PARAMETER;`
`539`	`539`	`}`
`@@ -626,7 +626,7 @@ sai_status_t meta_generic_validation_objlist(`
`626`	`626`
`627`	`627`	`if (!object_reference_exists(query_switch_id))`
`628`	`628`	`{`
`629`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);`
	`629`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);`
`630`	`630`	`return SAI_STATUS_INVALID_PARAMETER;`
`631`	`631`	`}`
`632`	`632`
`@@ -652,7 +652,7 @@ sai_status_t meta_genetic_validation_list(`
`652`	`652`
`653`	`653`	`if (count > MAX_LIST_COUNT)`
`654`	`654`	`{`
`655`		`- META_LOG_ERROR(md, "list count %u is > then max list count %u", count, MAX_LIST_COUNT);`
	`655`	`+ META_LOG_ERROR(md, "list count %u > max list count %u", count, MAX_LIST_COUNT);`
`656`	`656`
`657`	`657`	`return SAI_STATUS_INVALID_PARAMETER;`
`658`	`658`	`}`
`@@ -924,7 +924,7 @@ sai_status_t meta_generic_validate_non_object_on_create(`
`924`	`924`
`925`	`925`	`if (!object_reference_exists(oid_switch_id))`
`926`	`926`	`{`
`927`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", oid_switch_id);`
	`927`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", oid_switch_id);`
`928`	`928`
`929`	`929`	`return SAI_STATUS_INVALID_PARAMETER;`
`930`	`930`	`}`
`@@ -950,7 +950,7 @@ sai_status_t meta_generic_validation_create(`
`950`	`950`
`951`	`951`	`if (attr_count > MAX_LIST_COUNT)`
`952`	`952`	`{`
`953`		`- SWSS_LOG_ERROR("create attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);`
	`953`	`+ SWSS_LOG_ERROR("create attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);`
`954`	`954`
`955`	`955`	`return SAI_STATUS_INVALID_PARAMETER;`
`956`	`956`	`}`
`@@ -1002,14 +1002,14 @@ sai_status_t meta_generic_validation_create(`
`1002`	`1002`
`1003`	`1003`	`if (!object_exists(switch_meta_key))`
`1004`	`1004`	`{`
`1005`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists yet", switch_id);`
	`1005`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist yet", switch_id);`
`1006`	`1006`
`1007`	`1007`	`return SAI_STATUS_INVALID_PARAMETER;`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`if (!object_reference_exists(switch_id))`
`1011`	`1011`	`{`
`1012`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists yet", switch_id);`
	`1012`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist yet", switch_id);`
`1013`	`1013`
`1014`	`1014`	`return SAI_STATUS_INVALID_PARAMETER;`
`1015`	`1015`	`}`
`@@ -1691,7 +1691,7 @@ sai_status_t meta_generic_validation_remove(`
`1691`	`1691`
`1692`	`1692`	`if (!object_reference_exists(oid))`
`1693`	`1693`	`{`
`1694`		`- SWSS_LOG_ERROR("object 0x%lx reference don't exists", oid);`
	`1694`	`+ SWSS_LOG_ERROR("object 0x%lx reference doesn't exist", oid);`
`1695`	`1695`
`1696`	`1696`	`return SAI_STATUS_INVALID_PARAMETER;`
`1697`	`1697`	`}`
`@@ -1776,7 +1776,7 @@ sai_status_t meta_generic_validation_set(`
`1776`	`1776`
`1777`	`1777`	`if (!object_reference_exists(switch_id))`
`1778`	`1778`	`{`
`1779`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", switch_id);`
	`1779`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", switch_id);`
`1780`	`1780`	`return SAI_STATUS_INVALID_PARAMETER;`
`1781`	`1781`	`}`
`1782`	`1782`	`}`
`@@ -2150,7 +2150,7 @@ sai_status_t meta_generic_validation_get(`
`2150`	`2150`
`2151`	`2151`	`if (attr_count > MAX_LIST_COUNT)`
`2152`	`2152`	`{`
`2153`		`- SWSS_LOG_ERROR("get attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);`
	`2153`	`+ SWSS_LOG_ERROR("get attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);`
`2154`	`2154`
`2155`	`2155`	`return SAI_STATUS_INVALID_PARAMETER;`
`2156`	`2156`	`}`
`@@ -2452,7 +2452,7 @@ sai_status_t meta_generic_validation_get_stats(`
`2452`	`2452`
`2453`	`2453`	`if (count > MAX_LIST_COUNT)`
`2454`	`2454`	`{`
`2455`		`- SWSS_LOG_ERROR("get stats count is too large %u > then max list count %u", count, MAX_LIST_COUNT);`
	`2455`	`+ SWSS_LOG_ERROR("get stats count %u > max list count %u", count, MAX_LIST_COUNT);`
`2456`	`2456`
`2457`	`2457`	`return SAI_STATUS_INVALID_PARAMETER;`
`2458`	`2458`	`}`
`@@ -2558,7 +2558,7 @@ void meta_generic_validation_post_create(`
`2558`	`2558`
`2559`	`2559`	`if (!object_reference_exists(query_switch_id))`
`2560`	`2560`	`{`
`2561`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);`
	`2561`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);`
`2562`	`2562`	`break;`
`2563`	`2563`	`}`
`2564`	`2564`
`@@ -3138,7 +3138,7 @@ void meta_generic_validation_post_get_objlist(`
`3138`	`3138`
`3139`	`3139`	`if (count > MAX_LIST_COUNT)`
`3140`	`3140`	`{`
`3141`		`- META_LOG_ERROR(md, "returned get object list count %u is > then max list count %u", count, MAX_LIST_COUNT);`
	`3141`	`+ META_LOG_ERROR(md, "returned get object list count %u > max list count %u", count, MAX_LIST_COUNT);`
`3142`	`3142`	`}`
`3143`	`3143`
`3144`	`3144`	`if (list == NULL)`
`@@ -3208,7 +3208,7 @@ void meta_generic_validation_post_get_objlist(`
`3208`	`3208`
`3209`	`3209`	`if (!object_reference_exists(query_switch_id))`
`3210`	`3210`	`{`
`3211`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", query_switch_id);`
	`3211`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", query_switch_id);`
`3212`	`3212`	`}`
`3213`	`3213`
`3214`	`3214`	`if (query_switch_id != switch_id)`
`@@ -3222,7 +3222,7 @@ void meta_generic_validation_post_get_objlist(`
`3222`	`3222`	`{\`
`3223`	`3223`	`if (list.count > MAX_LIST_COUNT)\`
`3224`	`3224`	`{\`
`3225`		`- META_LOG_ERROR(md, "list count %u is > then max list count %u", list.count, MAX_LIST_COUNT);\`
	`3225`	`+ META_LOG_ERROR(md, "list count %u > max list count %u", list.count, MAX_LIST_COUNT);\`
`3226`	`3226`	`}\`
`3227`	`3227`	`}`
`3228`	`3228`
`@@ -4595,7 +4595,7 @@ sai_status_t meta_sai_get_oid(`
`4595`	`4595`
`4596`	`4596`	`if (!object_reference_exists(switch_id))`
`4597`	`4597`	`{`
`4598`		`- SWSS_LOG_ERROR("switch id 0x%lx don't exists", switch_id);`
	`4598`	`+ SWSS_LOG_ERROR("switch id 0x%lx doesn't exist", switch_id);`
`4599`	`4599`	`}`
`4600`	`4600`
`4601`	`4601`	`meta_generic_validation_post_get(meta_key, switch_id, attr_count, attr_list);`
`@@ -4864,7 +4864,7 @@ sai_status_t meta_sai_flush_fdb_entries(`
`4864`	`4864`
`4865`	`4865`	`if (attr_count > MAX_LIST_COUNT)`
`4866`	`4866`	`{`
`4867`		`- SWSS_LOG_ERROR("create attribute count is too large %u > then max list count %u", attr_count, MAX_LIST_COUNT);`
	`4867`	`+ SWSS_LOG_ERROR("create attribute count %u > max list count %u", attr_count, MAX_LIST_COUNT);`
`4868`	`4868`
`4869`	`4869`	`return SAI_STATUS_INVALID_PARAMETER;`
`4870`	`4870`	`}`
`@@ -4889,7 +4889,7 @@ sai_status_t meta_sai_flush_fdb_entries(`
`4889`	`4889`
`4890`	`4890`	`if (!object_reference_exists(switch_id))`
`4891`	`4891`	`{`
`4892`		`- SWSS_LOG_ERROR("switch id %s don't exists",`
	`4892`	`+ SWSS_LOG_ERROR("switch id %s doesn't exist",`
`4893`	`4893`	`sai_serialize_object_id(switch_id).c_str());`
`4894`	`4894`
`4895`	`4895`	`return SAI_STATUS_INVALID_PARAMETER;`