Clang-format cleanup
It looks like some of the code reviews in progress contain clang-format
fixes as well.
This squashes all of the clang-format fixes into a single commit, that
hopefully can go through the process a little faster, as it should only
be whitespace changes.
In the past, clang-formatting the naughty strings file proved
to return inconsistent results, and even formatted files would still be
detected as unformatted. Aparently the solution was to run
clang-format-5.0 approximately 20 times in a loop, until it decided on
a code layout that it was ok with iteration to iteration.
This is a bit of a corner case, so I don't think we need to get CI
running multiple runs in the future, and can just handle this on a case
by case basis. I'd be surprised if anyone else had this issue.
Change-Id: I57e2a03676bce20dc376fd9cea724732b2dc7010
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
diff --git a/include/big_list_of_naughty_strings.hpp b/include/big_list_of_naughty_strings.hpp
index fd492ce..8438366 100644
--- a/include/big_list_of_naughty_strings.hpp
+++ b/include/big_list_of_naughty_strings.hpp
@@ -1,3 +1,7 @@
+#pragma once
+
+// clang-format off
+
const std::string naughty_strings[] = {
// sourced from
// https://raw.githubusercontent.com/minimaxir/big-list-of-naughty-strings/master/blns.txt
@@ -68,25 +72,223 @@
// Unicode additional control characters: all of the characters with
// general category Cf (in Unicode 8.0.0).
// The next line may appear to be blank or mojibake in some viewers.
- "ￂﾭﾀﾁﾂﾃﾄﾅﾜￛﾝￜﾏ￡ﾠﾎ￢ﾀﾋ￢ﾀﾌ￢ﾀﾍ￢ﾀﾎ￢ﾀﾏ￢ﾀﾪ￢ﾀﾫ￢ﾀﾬ￢"
- "ﾀﾭ￢ﾀﾮ￢ﾁﾠ￢ﾁﾡ￢ﾁﾢ￢ﾁﾣ￢ﾁﾤ￢ﾁﾦ￢ﾁﾧ￢ﾁﾨ￢ﾁﾩ￢ﾁﾪ￢ﾁﾫ￢ﾁﾬ￢ﾁﾭ￢ﾁﾮ￢ﾁﾯﾻ"
+ "ￂﾭﾀﾁﾂﾃﾄﾅﾜￛﾝￜﾏ￡ﾠﾎ￢"
+ "ﾀ"
+ "ﾋ"
+ "￢"
+ "ﾀ"
+ "ﾌ"
+ "￢"
+ "ﾀ"
+ "ﾍ"
+ "￢"
+ "ﾀ"
+ "ﾎ"
+ "￢"
+ "ﾀ"
+ "ﾏ"
+ "￢"
+ "ﾀ"
+ "ﾪ"
+ "￢"
+ "ﾀ"
+ "ﾫ"
+ "￢"
+ "ﾀ"
+ "ﾬ"
+ "￢"
+ "ﾀﾭ￢ﾀﾮ￢ﾁﾠ￢ﾁﾡ￢ﾁﾢ￢ﾁﾣ￢ﾁﾤ￢ﾁﾦ￢"
+ "ﾁ"
+ "ﾧ"
+ "￢"
+ "ﾁ"
+ "ﾨ"
+ "￢"
+ "ﾁ"
+ "ﾩ"
+ "￢"
+ "ﾁ"
+ "ﾪ"
+ "￢"
+ "ﾁ"
+ "ﾫ"
+ "￢"
+ "ﾁ"
+ "ﾬ"
+ "￢"
+ "ﾁ"
+ "ﾭ"
+ "￢"
+ "ﾁ"
+ "ﾮ"
+ "￢"
+ "ﾁ"
+ "ﾯ"
+ ""
+ "ﾻ"
""
- "ﾹﾺﾻﾑﾂﾽﾛﾲﾠﾛﾲﾡﾛﾲﾢﾛﾲﾣﾝﾅﾳﾝﾅﾴﾝﾅﾵﾝﾅﾶ"
- "ﾝﾅﾷﾝﾅﾸﾝﾅﾹﾝﾅﾺﾠﾀﾁﾠﾀﾠﾠﾀﾡﾠﾀﾢﾠﾀﾣﾠﾀﾤ"
+ "ﾹﾺﾻﾑﾂﾽﾛﾲﾠﾛﾲﾡﾛﾲﾢ"
+ ""
+ "ﾛ"
+ "ﾲ"
+ "ﾣ"
+ ""
+ "ﾝ"
+ "ﾅ"
+ "ﾳ"
+ ""
+ "ﾝ"
+ "ﾅ"
+ "ﾴ"
+ ""
+ "ﾝ"
+ "ﾅ"
+ "ﾵ"
+ ""
+ "ﾝ"
+ "ﾅ"
+ "ﾶ"
+ "ﾝﾅﾷﾝﾅﾸﾝﾅﾹﾝﾅﾺﾠﾀﾁﾠﾀﾠ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾡ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾢ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾣ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾤ"
"ﾠ"
- "ﾀﾥﾠﾀﾦﾠﾀﾧﾠﾀﾨﾠﾀﾩﾠﾀﾪﾠﾀﾫﾠﾀﾬﾠﾀﾭﾠﾀﾮ"
- "ﾠﾀﾯﾠﾀﾰﾠﾀﾱﾠﾀﾲﾠﾀﾳﾠﾀﾴﾠﾀﾵﾠﾀﾶﾠﾀﾷ"
+ "ﾀﾥﾠﾀﾦﾠﾀﾧﾠﾀﾨﾠﾀﾩﾠﾀﾪﾠ"
+ "ﾀ"
+ "ﾫ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾬ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾭ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾮ"
+ "ﾠﾀﾯﾠﾀﾰﾠﾀﾱﾠﾀﾲﾠﾀﾳﾠﾀﾴ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾵ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾶ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ "ﾷ"
"ﾠﾀﾸ"
- "ﾠﾀﾹﾠﾀﾺﾠﾀﾻﾠﾀﾼﾠﾀﾽﾠﾀﾾﾠﾀﾠﾁﾀﾠﾁﾁ"
- "ﾠﾁﾂﾠﾁﾃﾠﾁﾄﾠﾁﾅﾠﾁﾆﾠﾁﾇﾠﾁﾈﾠﾁﾉﾠﾁﾊ"
+ "ﾠﾀﾹﾠﾀﾺﾠﾀﾻﾠﾀﾼﾠﾀﾽﾠﾀﾾ"
+ ""
+ "ﾠ"
+ "ﾀ"
+ ""
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾀ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾁ"
+ "ﾠﾁﾂﾠﾁﾃﾠﾁﾄﾠﾁﾅﾠﾁﾆﾠﾁﾇ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾈ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾉ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾊ"
"ﾠﾁﾋ"
- "ﾠﾁﾌﾠﾁﾍﾠﾁﾎﾠﾁﾏﾠﾁﾐﾠﾁﾑﾠﾁﾒﾠﾁﾓﾠﾁﾔ"
- "ﾠﾁﾕﾠﾁﾖﾠﾁﾗﾠﾁﾘﾠﾁﾙﾠﾁﾚﾠﾁﾛﾠﾁﾜﾠﾁﾝ"
+ "ﾠﾁﾌﾠﾁﾍﾠﾁﾎﾠﾁﾏﾠﾁﾐﾠﾁﾑ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾒ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾓ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾔ"
+ "ﾠﾁﾕﾠﾁﾖﾠﾁﾗﾠﾁﾘﾠﾁﾙﾠﾁﾚ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾛ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾜ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾝ"
"ﾠﾁﾞ"
- "ﾠﾁﾟﾠﾁﾠﾠﾁﾡﾠﾁﾢﾠﾁﾣﾠﾁﾤﾠﾁﾥﾠﾁﾦﾠﾁﾧ"
- "ﾠﾁﾨﾠﾁﾩﾠﾁﾪﾠﾁﾫﾠﾁﾬﾠﾁﾭﾠﾁﾮﾠﾁﾯﾠﾁﾰ"
+ "ﾠﾁﾟﾠﾁﾠﾠﾁﾡﾠﾁﾢﾠﾁﾣﾠﾁﾤ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾥ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾦ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾧ"
+ "ﾠﾁﾨﾠﾁﾩﾠﾁﾪﾠﾁﾫﾠﾁﾬﾠﾁﾭ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾮ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾯ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾰ"
"ﾠﾁﾱ"
- "ﾠﾁﾲﾠﾁﾳﾠﾁﾴﾠﾁﾵﾠﾁﾶﾠﾁﾷﾠﾁﾸﾠﾁﾹﾠﾁﾺ"
+ "ﾠﾁﾲﾠﾁﾳﾠﾁﾴﾠﾁﾵﾠﾁﾶﾠﾁﾷ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾸ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾹ"
+ ""
+ "ﾠ"
+ "ﾁ"
+ "ﾺ"
"ﾠﾁﾻﾠﾁﾼﾠﾁﾽﾠﾁﾾﾠﾁ"
"",
@@ -99,22 +301,82 @@
// Strings which contain common unicode symbols (e.g. smart quotes)
"ￎﾩ￢ﾉﾈￃﾧ￢ﾈﾚ￢ﾈﾫￋﾜￂﾵ￢ﾉﾤ￢ﾉﾥￃﾷ", "ￃﾥￃﾟ￢ﾈﾂￆﾒￂﾩￋﾙ￢ﾈﾆￋﾚￂﾬ￢ﾀﾦￃﾦ",
- "ￅﾓ￢ﾈﾑￂﾴￂﾮ￢ﾀﾠￂﾥￂﾨￋﾆￃﾸￏﾀ￢ﾀﾜ￢ﾀ"
+ "ￅﾓ￢ﾈﾑￂﾴￂﾮ￢ﾀﾠￂﾥￂﾨￋﾆￃﾸￏﾀ￢ﾀ"
+ "ﾜ"
+ "￢"
+ "ﾀ"
"ﾘ",
"ￂﾡ￢ﾄﾢￂﾣￂﾢ￢ﾈﾞￂﾧￂﾶ￢ﾀﾢￂﾪￂﾺ￢ﾀﾓ￢ﾉ"
"ﾠ",
"ￂﾸￋﾛￃﾇ￢ﾗﾊￄﾱￋﾜￃﾂￂﾯￋﾘￂ",
- "ￃﾅￃﾍￃﾎￃﾏￋﾝￃﾓￃﾔﾣￃﾒￃﾚￃﾆ￢ﾘ"
+ "ￃﾅￃﾍￃﾎￃﾏￋﾝￃﾓￃﾔﾣￃﾒￃﾚￃﾆ￢"
+ "ﾘ"
"ﾃ",
"ￅﾒ￢ﾀﾞￂﾴ￢ﾀﾰￋﾇￃﾁￂﾨￋﾆￃﾘ￢ﾈﾏ￢ﾀﾝ￢ﾀﾙ",
- "`￢ﾁﾄ￢ﾂﾬ￢ﾀﾹ￢ﾀﾺﾬﾁﾬﾂ￢ﾀﾡￂﾰￂﾷ￢ﾀﾚ￢ﾀﾔￂ"
+ "`￢ﾁﾄ￢ﾂﾬ￢ﾀﾹ￢ﾀﾺﾬﾁﾬﾂ￢ﾀﾡￂﾰￂ"
+ "ﾷ"
+ "￢"
+ "ﾀ"
+ "ﾚ"
+ "￢"
+ "ﾀ"
+ "ﾔ"
+ "ￂ"
"ﾱ",
"￢ﾅﾛ￢ﾅﾜ￢ﾅﾝ￢ﾅﾞ",
- "ﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒ"
- "ﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟﾠﾡﾢﾣﾤ"
+ "ﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ"
+ ""
+ "ﾍ"
+ ""
+ "ﾎ"
+ ""
+ "ﾏ"
+ ""
+ "ﾐ"
+ ""
+ "ﾑ"
+ ""
+ "ﾒ"
+ "ﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞ"
+ ""
+ "ﾟ"
+ ""
+ "ﾠ"
+ ""
+ "ﾡ"
+ ""
+ "ﾢ"
+ ""
+ "ﾣ"
+ ""
+ "ﾤ"
"ﾥﾦ"
- "ﾧﾨﾩﾪﾫﾬﾭﾮﾯﾰﾱﾲﾳﾴﾵﾶﾷﾸ"
- "ﾹﾺﾻﾼﾽﾾﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊ"
+ "ﾧﾨﾩﾪﾫﾬﾭﾮﾯﾰﾱﾲ"
+ ""
+ "ﾳ"
+ ""
+ "ﾴ"
+ ""
+ "ﾵ"
+ ""
+ "ﾶ"
+ ""
+ "ﾷ"
+ ""
+ "ﾸ"
+ "ﾹﾺﾻﾼﾽﾾﾀﾁﾂﾃﾄ"
+ ""
+ "ﾅ"
+ ""
+ "ﾆ"
+ ""
+ "ﾇ"
+ ""
+ "ﾈ"
+ ""
+ "ﾉ"
+ ""
+ "ﾊ"
"ﾋﾌ"
"ﾍﾎﾏ",
"ﾠﾡﾢﾣﾤﾥﾦﾧﾨﾩ",
@@ -122,7 +384,7 @@
// Unicode Subscript/Superscript/Accents
//
// Strings which contain unicode subscripts/superscripts; can cause
- //rendering issues
+ // rendering issues
"￢ﾁﾰ￢ﾁﾴ￢ﾁﾵ", "￢ﾂﾀ￢ﾂﾁ￢ﾂﾂ", "￢ﾁﾰ￢ﾁﾴ￢ﾁﾵ￢ﾂﾀ￢ﾂﾁ￢ﾂﾂ",
"￠ﾸﾔ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾇ￠ﾹﾇ￠ﾹﾇ￠ﾹﾇ￠ﾹﾇ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾉ￠ﾹﾇ￠ﾹﾇ￠"
@@ -150,7 +412,7 @@
// Quotation Marks
//
// Strings which contain misplaced quotation marks; can cause encoding
- //errors
+ // errors
"'", "\"", "''", "\"\"", "'\"'", "\"''''\"'\"", "\"'\"'\"''''\"",
"<foo val=￢ﾀﾜbar￢ﾀﾝ />", "<foo val=￢ﾀﾜbar￢ﾀﾝ />",
@@ -159,19 +421,36 @@
// Two-Byte Characters
//
// Strings which contain two-byte characters: can cause rendering issues or
- //character-length issues
+ // character-length issues
- "ﾔﾰ￤ﾸﾭ￣ﾁﾕ￣ﾂﾓ￣ﾁﾫ￣ﾁﾂ￣ﾁﾒ￣ﾁﾦ￤ﾸﾋ￣ﾁﾕ￣ﾁ"
+ "ﾔﾰ￤ﾸﾭ￣ﾁﾕ￣ﾂﾓ￣ﾁﾫ￣ﾁﾂ￣ﾁﾒ￣ﾁﾦ"
+ "￤"
+ "ﾸ"
+ "ﾋ"
+ "￣"
+ "ﾁ"
+ "ﾕ"
+ "￣"
+ "ﾁ"
"ﾄ",
"￣ﾃﾑ￣ﾃﾼ￣ﾃﾆ￣ﾂﾣ￣ﾃﾼ￣ﾁﾸ￨ﾡﾌ￣ﾁﾋ￣ﾁﾪ￣ﾁﾄ￣ﾁﾋ", "￥ﾒﾌ￨ﾣﾽ￦ﾼﾢ￨ﾪﾞ",
"￩ﾃﾨ￨ﾐﾽ￦ﾠﾼ", "￬ﾂﾬ￭ﾚﾌ￪ﾳﾼ￭ﾕﾙ￬ﾛﾐ ￬ﾖﾴ￭ﾕﾙ￬ﾗﾰ￪ﾵﾬ￬ﾆﾌ",
- "￬ﾰﾦ￬ﾰﾨ￫ﾥﾼ ￭ﾃﾀ￪ﾳﾠ ￬ﾘﾨ ￭ﾎﾲ￬ﾋﾜ￫ﾧﾨ￪ﾳﾼ "
+ "￬ﾰﾦ￬ﾰﾨ￫ﾥﾼ ￭ﾃﾀ￪ﾳﾠ ￬ﾘﾨ "
+ "￭ﾎﾲ￬ﾋﾜ￫ﾧﾨ￪ﾳﾼ "
"￬ﾑﾛ￫ﾋﾤ￫ﾦﾬ "
"￫ﾘﾠ￫ﾰﾩ￪ﾰﾁ￭ﾕﾘ",
- "ﾤﾾ￦ﾜﾃﾧﾑ￥ﾭﾸ￩ﾙﾢ￨ﾪﾞ￥ﾭﾸﾠﾔﾩﾶ￦ﾉ"
+ "ﾤﾾ￦ﾜﾃﾧﾑ￥ﾭﾸ￩ﾙﾢ￨ﾪﾞ￥ﾭﾸﾠﾔ"
+ ""
+ "ﾩ"
+ "ﾶ"
+ "￦"
+ "ﾉ"
"ﾀ",
"￬ﾚﾸ￫ﾞﾀ￫ﾰﾔ￭ﾆﾠ￫ﾥﾴ",
- "ﾠﾜﾎﾠﾜﾱﾠﾝﾹﾠﾱﾓﾠﾱﾸﾠﾲﾖﾠﾳ"
+ "ﾠﾜﾎﾠﾜﾱﾠﾝﾹﾠﾱﾓﾠﾱﾸﾠﾲﾖ"
+ ""
+ "ﾠ"
+ "ﾳ"
"ﾏ",
// Changing length when lowercased
@@ -184,14 +463,15 @@
// Japanese Emoticons
//
// Strings which consists of Japanese-style emoticons which are popular on
- //the web
+ // the web
"￣ﾃﾽ￠ﾼﾼ￠ﾺﾈﾄￍﾜ￠ﾺﾈ￠ﾼﾽﾾﾉ "
"￣ﾃﾽ￠ﾼﾼ￠ﾺﾈﾄￍﾜ￠ﾺﾈ￠ﾼﾽﾾﾉ",
"(ﾽﾡ￢ﾗﾕ ￢ﾈﾀ ￢ﾗﾕﾽﾡ)",
"ﾽﾀﾽﾨ(ￂﾴ￢ﾈﾀﾽﾀ￢ﾈﾩ", "__ﾾﾛ(,_,*)",
"￣ﾃﾻ(ﾣ￢ﾈﾀﾣ)￣ﾃﾻ:*:",
- "ﾾﾟﾽﾥ￢ﾜ￣ﾃﾾ￢ﾕﾲ(ﾽﾡ￢ﾗﾕ￢ﾀ￢ﾗﾕﾽﾡ)"
+ "ﾾﾟﾽﾥ￢ﾜ￣ﾃﾾ￢ﾕﾲ("
+ "ﾽﾡ￢ﾗﾕ￢ﾀ￢ﾗﾕﾽﾡ)"
"￢ﾕﾱ￢ﾜﾽﾥﾾﾟ",
",￣ﾀﾂ￣ﾃﾻ:*:￣ﾃﾻ￣ﾂﾜ￢ﾀﾙ( ￢ﾘﾻ ￏﾉ ￢ﾘﾻ )￣ﾀﾂ￣ﾃﾻ:*:￣ﾃﾻ￣ﾂﾜ￢ﾀﾙ",
"(￢ﾕﾯￂﾰ￢ﾖﾡￂﾰﾼﾉ￢ﾕﾯﾸﾵ "
@@ -203,20 +483,34 @@
// Emoji
//
// Strings which contain Emoji; should be the same behavior as two-byte
- //characters, but not always
+ // characters, but not always
"ﾟﾘﾍ", "ﾟﾑﾩﾟﾏﾽ",
- "ﾟﾑﾾ ﾟﾙﾇ ﾟﾒﾁ ﾟﾙﾅ ﾟﾙﾆ ﾟﾙﾋ ﾟﾙﾎ "
+ "ﾟﾑﾾ ﾟﾙﾇ ﾟﾒﾁ ﾟﾙﾅ ﾟﾙﾆ "
+ "ﾟﾙﾋ "
+ "ﾟﾙﾎ "
"ﾟﾙﾍ",
"ﾟﾐﾵ ﾟﾙﾈ ﾟﾙﾉ ﾟﾙﾊ",
- "￢ﾝﾤﾸﾏ ﾟﾒﾔ ﾟﾒﾌ ﾟﾒﾕ ﾟﾒﾞ ﾟﾒﾓ ﾟﾒﾗ ﾟﾒﾖ ﾟﾒﾘ ﾟﾒﾝ "
+ "￢ﾝﾤﾸﾏ ﾟﾒﾔ ﾟﾒﾌ ﾟﾒﾕ ﾟﾒﾞ "
+ "ﾟﾒﾓ "
+ "ﾟﾒﾗ "
+ "ﾟﾒﾖ "
+ "ﾟﾒﾘ "
+ "ﾟﾒﾝ "
"ﾟﾒﾟ ﾟﾒﾜ ﾟﾒﾛ ﾟﾒﾚ "
"ﾟﾒﾙ",
- "￢ﾜﾋﾟﾏ ﾟﾒﾪﾟﾏ ﾟﾑﾐﾟﾏ ﾟﾙﾌﾟﾏ ﾟﾑﾏﾟﾏ "
+ "￢ﾜﾋﾟﾏ ﾟﾒﾪﾟﾏ ﾟﾑﾐﾟﾏ "
+ "ﾟﾙﾌﾟﾏ "
+ "ﾟﾑﾏﾟﾏ "
"ﾟﾙﾏﾟﾏ",
- "ﾟﾚﾾ ﾟﾆﾒ ﾟﾆﾓ ﾟﾆﾕ ﾟﾆﾖ ﾟﾆﾗ ﾟﾆﾙ "
+ "ﾟﾚﾾ ﾟﾆﾒ ﾟﾆﾓ ﾟﾆﾕ ﾟﾆﾖ "
+ "ﾟﾆﾗ "
+ "ﾟﾆﾙ "
"ﾟﾏﾧ",
- "0ﾸﾏ￢ﾃﾣ 1ﾸﾏ￢ﾃﾣ 2ﾸﾏ￢ﾃﾣ 3ﾸﾏ￢ﾃﾣ 4ﾸﾏ￢ﾃﾣ 5ﾸﾏ￢ﾃﾣ "
+ "0ﾸﾏ￢ﾃﾣ 1ﾸﾏ￢ﾃﾣ 2ﾸﾏ￢ﾃﾣ "
+ "3ﾸﾏ￢ﾃﾣ "
+ "4ﾸﾏ￢ﾃﾣ "
+ "5ﾸﾏ￢ﾃﾣ "
"6ﾸﾏ￢ﾃﾣ 7ﾸﾏ￢ﾃﾣ 8ﾸﾏ￢ﾃﾣ "
"9ﾸﾏ￢ﾃﾣ "
"ﾟﾔﾟ",
@@ -228,57 +522,101 @@
"ﾟﾇﾺﾟﾇﾸﾟﾇﾷﾟﾇﾺﾟﾇﾸ "
"ﾟﾇﾦﾟﾇﾫﾟﾇﾦﾟﾇﾲﾟﾇﾸ",
- "ﾟﾇﾺﾟﾇﾸﾟﾇﾷﾟﾇﾺﾟﾇﾸﾟﾇﾦﾟﾇﾫﾟﾇﾦﾟﾇ"
+ "ﾟﾇﾺﾟﾇﾸﾟﾇﾷﾟﾇﾺﾟﾇﾸﾟﾇﾦ"
+ ""
+ "ﾟ"
+ "ﾇ"
+ "ﾫ"
+ ""
+ "ﾟ"
+ "ﾇ"
+ "ﾦ"
+ ""
+ "ﾟ"
+ "ﾇ"
"ﾲ",
"ﾟﾇﾺﾟﾇﾸﾟﾇﾷﾟﾇﾺﾟﾇﾸﾟﾇﾦ",
// Unicode Numbers
//
// Strings which contain unicode numbers; if the code is localized, it
- //should see the input as numeric
+ // should see the input as numeric
"ﾼﾑﾼﾒﾼﾓ", "ﾡﾢﾣ",
// Right-To-Left Strings
//
// Strings which contain text that should be rendered RTL if possible (e.g.
- //Arabic, Hebrew)
+ // Arabic, Hebrew)
"ﾫﾅ ﾆﾁﾳ ﾳﾂﾷﾪ "
- "ﾈﾨﾧﾄﾪﾭﾯﾊﾯﾌ, ﾬﾲﾊﾱﾪﾊ "
+ "ﾈﾨﾧﾄﾪﾭﾯﾊﾯﾌ, "
+ "ﾬﾲﾊﾱﾪﾊ "
"ﾨﾧﾳﾪﾮﾯﾧﾅ ﾣﾆ "
- "ﾯﾆﾈ. ﾥﾰ ﾇﾆﾧﾟ ﾧﾄﾳﾪﾧﾱ "
- "ﾈﾪﾆﾵﾊﾨ ﾃﾧﾆ. ﾣﾇﾑﾄ "
+ "ﾯﾆﾈ. ﾥﾰ ﾇﾆﾧﾟ "
+ "ﾧﾄﾳﾪﾧﾱ "
+ "ﾈﾪﾆﾵﾊﾨ ﾃﾧﾆ. "
+ "ﾣﾇﾑﾄ "
"ﾧﾊﾷﾧﾄﾊﾧﾌ "
- "ﾨﾱﾊﾷﾧﾆﾊﾧ-ﾁﾱﾆﾳﾧ ﾂﾯ "
- "ﾣﾮﾰ. ﾳﾄﾊﾅﾧﾆﾌ ﾥﾪﾁﾧﾂﾊﾩ "
+ "ﾨﾱﾊﾷﾧﾆﾊﾧ-"
+ "ﾁﾱﾆﾳﾧ "
+ "ﾂﾯ "
+ "ﾣﾮﾰ. ﾳﾄﾊﾅﾧﾆﾌ "
+ "ﾥﾪﾁﾧﾂﾊﾩ "
"ﾨﾊﾆ "
- "ﾅﾧ, ﾊﾰﾃﾱ ﾧﾄﾭﾯﾈﾯ ﾣﾊ "
+ "ﾅﾧ, ﾊﾰﾃﾱ "
+ "ﾧﾄﾭﾯﾈﾯ "
+ "ﾣﾊ "
"ﾨﾹﾯ, ﾅﾹﾧﾅﾄﾩ "
"ﾨﾈﾄﾆﾯﾧﾌ "
"ﾧﾄﾥﾷﾄﾧﾂ ﾹﾄ "
"ﾥﾊﾈ.",
"ￗﾑￖﾰￖﾼￗﾨￖﾵￗﾐￗﾩￖﾴￗﾁￗﾙￗﾪ, ￗﾑￖﾸￖﾼￗﾨￖﾸￗﾐ ￗﾐￖﾱￗﾜￖﾹￗﾔￖﾴￗﾙￗﾝ, ￗﾐￖﾵￗﾪ "
"ￗﾔￖﾷￗﾩￖﾸￖﾼￗﾁￗﾞￖﾷￗﾙￖﾴￗﾝ, ￗﾕￖﾰￗﾐￖﾵￗﾪ ￗﾔￖﾸￗﾐￖﾸￗﾨￖﾶￗﾥ",
- "ￗﾔￖﾸￗﾙￖﾰￗﾪￖﾸￗﾔtestﾧﾄﾵﾁﾭﾧﾪ "
+ "ￗﾔￖﾸￗﾙￖﾰￗﾪￖﾸￗﾔtestﾧﾄﾵﾁ"
+ "ﾭ"
+ ""
+ "ﾧ"
+ ""
+ "ﾪ"
+ " "
"ﾧﾄﾪﾑﾭﾈﾄ",
"ﾷﾽ", "ﾷﾺ",
- "ﾅﾏﾆﾎﾧﾂﾎﾴﾎﾩﾏ ﾳﾏﾨﾏﾄﾐ "
- "ﾧﾐﾳﾒﾪﾐﾮﾒﾯﾎﾧﾅﾐ"
+ "ﾅﾏﾆﾎﾧﾂﾎﾴﾎﾩﾏ "
+ "ﾳﾏﾨﾏﾄﾐ "
+ "ﾧﾐﾳﾒﾪﾐﾮﾒﾯﾎﾧﾅ"
+ ""
+ "ﾐ"
" "
"ﾧﾄﾄﾑﾏﾺﾎﾩﾐ ﾁﾐﾊ "
"ﾧﾄﾆﾑﾏﾸﾏﾅﾐ "
"ﾧﾄﾒﾂﾎﾧﾦﾐﾅﾎﾩﾐ "
- "ﾈﾎﾁﾐﾊﾅ ﾊﾎﾮﾏﾵﾑﾎ "
- "ﾧﾄﾪﾑﾎﾷﾒﾨﾐﾊﾂﾎﾧﾪﾏ"
+ "ﾈﾎﾁﾐﾊﾅ "
+ "ﾊﾎﾮﾏﾵﾑﾎ "
+ "ﾧﾄﾪﾑﾎﾷﾒﾨﾐﾊﾂﾎ"
+ ""
+ "ﾧ"
+ ""
+ "ﾪ"
+ ""
+ "ﾏ"
" "
- "ﾧﾄﾒﾭﾧﾳﾏﾈﾨﾐﾊﾑﾎﾩﾏﾌ"
+ "ﾧﾄﾒﾭﾧﾳﾏﾈﾨﾐﾊﾑ"
+ ""
+ "ﾎ"
+ ""
+ "ﾩ"
+ ""
+ "ﾏ"
+ ""
+ "ﾌ"
" ",
// Trick Unicode
//
// Strings which contain unicode with unusual properties (e.g.
- //Right-to-left override) (c.f. http://www.unicode.org/charts/PDF/U2000.pdf)
+ // Right-to-left override) (c.f.
+ // http://www.unicode.org/charts/PDF/U2000.pdf)
"￢ﾀﾪ￢ﾀﾪtest￢ﾀﾪ", "￢ﾀﾫtest￢ﾀﾫ", "￢ﾀﾩtest￢ﾀﾩ",
"test￢ﾁﾠtest￢ﾀﾫ", "￢ﾁﾦtest￢ﾁﾧ",
@@ -286,25 +624,199 @@
// Zalgo Text
//
// Strings which contain \"corrupted\" text. The corruption will not appear
- //in non-HTML text, however. (via http://www.eeemo.net)
+ // in non-HTML text, however. (via http://www.eeemo.net)
- "￡ﾹﾰￌﾺￌﾺￌﾕoￍﾞ ￌﾷiￌﾲￌﾬￍﾇￌﾪￍﾙnￌﾝￌﾗￍﾕvￌﾟￌﾜￌﾘￌﾦￍﾟoￌﾶￌﾙￌﾰￌﾠkￃﾨￍﾚￌﾮￌﾺￌﾪￌﾹￌﾱￌﾤ "
+ "￡ﾹﾰￌﾺￌﾺￌﾕoￍﾞ "
+ "ￌﾷiￌﾲￌﾬￍﾇￌﾪￍﾙnￌﾝￌﾗￍﾕvￌﾟￌﾜￌﾘￌﾦￍﾟoￌﾶￌﾙￌﾰￌ"
+ "ﾠ"
+ "k"
+ "ￃ"
+ "ﾨ"
+ "ￍ"
+ "ﾚ"
+ "ￌ"
+ "ﾮ"
+ "ￌ"
+ "ﾺ"
+ "ￌ"
+ "ﾪ"
+ "ￌ"
+ "ﾹ"
+ "ￌ"
+ "ﾱ"
+ "ￌ"
+ "ﾤ"
+ " "
"ￌﾖtￌﾝￍﾕￌﾳￌﾣￌﾻￌﾪￍﾞhￌﾼￍﾓￌﾲￌﾦￌﾳￌﾘￌﾲeￍﾇￌﾣￌﾰￌﾦￌﾬￍﾎ "
"ￌﾢￌﾼￌﾻￌﾱￌﾘhￍﾚￍﾎￍﾙￌﾜￌﾣￌﾲￍﾅiￌﾦￌﾲￌﾣￌﾰￌﾤvￌﾻￍﾍeￌﾺￌﾭￌﾳￌﾪￌﾰ-"
"mￌﾢiￍﾅnￌﾖￌﾺￌﾞￌﾲￌﾯￌﾰdￌﾵￌﾼￌﾟￍﾙￌﾩￌﾼￌﾘￌﾳ "
- "ￌﾞￌﾥￌﾱￌﾳￌﾭrￌﾛￌﾗￌﾘeￍﾙpￍﾠrￌﾼￌﾞￌﾻￌﾭￌﾗeￌﾺￌﾠￌﾣￍﾟsￌﾘￍﾇￌﾳￍﾍￌﾝￍﾉeￍﾉￌﾥￌﾯￌﾞￌﾲￍﾚￌ"
- "ﾬￍﾜￇﾹￌﾬￍﾎￍﾎￌﾟￌﾖￍﾇￌﾤtￍﾍￌﾬￌﾤￍﾓￌﾼￌﾭￍﾘￍﾅiￌﾪￌﾱnￍﾠgￌﾴￍﾉ"
+ "ￌﾞￌﾥￌﾱￌﾳￌﾭrￌﾛￌﾗￌﾘeￍﾙpￍﾠrￌﾼￌ"
+ "ﾞ"
+ "ￌ"
+ "ﾻ"
+ "ￌ"
+ "ﾭ"
+ "ￌ"
+ "ﾗ"
+ "e"
+ "ￌ"
+ "ﾺ"
+ "ￌ"
+ "ﾠ"
+ "ￌ"
+ "ﾣ"
+ "ￍ"
+ "ﾟ"
+ "s"
+ "ￌ"
+ "ﾘ"
+ "ￍ"
+ "ﾇ"
+ "ￌ"
+ "ﾳ"
+ "ￍ"
+ "ﾍ"
+ "ￌ"
+ "ﾝ"
+ "ￍ"
+ "ﾉ"
+ "e"
+ "ￍ"
+ "ﾉ"
+ "ￌ"
+ "ﾥ"
+ "ￌ"
+ "ﾯ"
+ "ￌ"
+ "ﾞ"
+ "ￌ"
+ "ﾲ"
+ "ￍ"
+ "ﾚ"
+ "ￌ"
+ "ﾬￍﾜￇﾹￌﾬￍﾎￍﾎￌﾟￌﾖￍﾇￌﾤtￍﾍￌﾬￌﾤￍﾓￌﾼￌﾭￍﾘￍﾅiￌﾪￌﾱnￍ"
+ "ﾠ"
+ "g"
+ "ￌ"
+ "ﾴ"
+ "ￍ"
+ "ﾉ"
" "
"ￍﾏￍﾉￍﾅcￌﾬￌﾟhￍﾡaￌﾫￌﾻￌﾯￍﾘoￌﾫￌﾟￌﾖￍﾍￌﾙￌﾝￍﾉsￌﾗￌﾦￌﾲ.ￌﾨￌﾹￍﾈￌﾣ",
- "ￌﾡￍﾓￌﾞￍﾅIￌﾗￌﾘￌﾦￍﾝnￍﾇￍﾇￍﾙvￌﾮￌﾫokￌﾲￌﾫￌﾙￍﾈiￌﾖￍﾙￌﾭￌﾹￌﾠￌﾞnￌﾡￌﾻￌﾮￌﾣￌﾺgￌﾲￍﾈￍﾙￌﾭ"
+ "ￌﾡￍﾓￌﾞￍﾅIￌﾗￌﾘￌﾦￍﾝnￍﾇￍﾇￍﾙvￌﾮￌﾫokￌﾲￌﾫￌﾙￍﾈiￌﾖￍﾙￌﾭￌﾹￌ"
+ "ﾠ"
+ "ￌ"
+ "ﾞ"
+ "n"
+ "ￌ"
+ "ﾡ"
+ "ￌ"
+ "ﾻ"
+ "ￌ"
+ "ﾮ"
+ "ￌ"
+ "ﾣ"
+ "ￌ"
+ "ﾺ"
+ "g"
+ "ￌ"
+ "ﾲ"
+ "ￍ"
+ "ﾈ"
+ "ￍ"
+ "ﾙ"
+ "ￌ"
+ "ﾭ"
"ￍﾙￌﾬￍﾎ ￌﾰtￍﾔￌﾦhￌﾞￌﾲeￌﾢￌﾤ "
- "ￍﾍￌﾬￌﾲￍﾖfￌﾴￌﾘￍﾕￌﾣￃﾨￍﾖ￡ﾺﾹￌﾥￌﾩlￍﾖￍﾔￍﾚiￍﾓￍﾚￌﾦￍﾠnￍﾖￍﾍￌﾗￍﾓￌﾳￌﾮgￍﾍ "
+ "ￍﾍￌﾬￌﾲￍﾖfￌﾴￌﾘￍﾕￌﾣￃﾨￍﾖ￡ﾺﾹￌﾥￌﾩlￍﾖￍﾔￍﾚiￍﾓￍﾚￌﾦￍ"
+ "ﾠ"
+ "n"
+ "ￍ"
+ "ﾖ"
+ "ￍ"
+ "ﾍ"
+ "ￌ"
+ "ﾗ"
+ "ￍ"
+ "ﾓ"
+ "ￌ"
+ "ﾳ"
+ "ￌ"
+ "ﾮ"
+ "g"
+ "ￍ"
+ "ﾍ"
+ " "
"ￌﾨoￍﾚￌﾪￍﾡfￌﾘￌﾣￌﾬ "
"ￌﾖￌﾘￍﾖￌﾟￍﾙￌﾮcￒﾉￍﾔￌﾫￍﾖￍﾓￍﾇￍﾖￍﾅhￌﾵￌﾤￌﾣￍﾚￍﾔￃﾡￌﾗￌﾼￍﾕￍﾅoￌﾼￌﾣￌﾥsￌﾱￍﾈￌﾺￌﾖￌﾦￌﾻￍﾢ."
"ￌﾛￌﾖￌﾞￌﾠￌﾫￌﾰ",
"ￌﾗￌﾺￍﾖￌﾹￌﾯￍﾓ￡ﾹﾮￌﾤￍﾍￌﾥￍﾇￍﾈhￌﾲￌﾁeￍﾏￍﾓￌﾼￌﾗￌﾙￌﾼￌﾣￍﾔ "
- "ￍﾇￌﾜￌﾱￌﾠￍﾓￍﾍￍﾅNￍﾕￍﾠeￌﾗￌﾱzￌﾘￌﾝￌﾜￌﾺￍﾙpￌﾤￌﾺￌﾹￍﾍￌﾯￍﾚeￌﾠￌﾻￌﾠￍﾜrￌﾨￌﾤￍﾍￌﾺ"
- "ￌﾖￍﾔￌﾖￌﾖdￌﾠￌﾟￌﾭￌﾬￌﾝￍﾟiￌﾦￍﾖￌﾩￍﾓￍﾔￌﾤaￌﾠￌﾗￌﾬￍﾉￌﾙnￍﾚￍﾜ"
+ "ￍﾇￌﾜￌﾱￌﾠￍﾓￍﾍￍﾅNￍﾕￍﾠeￌﾗￌﾱzￌ"
+ "ﾘ"
+ "ￌ"
+ "ﾝ"
+ "ￌ"
+ "ﾜ"
+ "ￌ"
+ "ﾺ"
+ "ￍ"
+ "ﾙ"
+ "p"
+ "ￌ"
+ "ﾤ"
+ "ￌ"
+ "ﾺ"
+ "ￌ"
+ "ﾹ"
+ "ￍ"
+ "ﾍ"
+ "ￌ"
+ "ﾯ"
+ "ￍ"
+ "ﾚ"
+ "e"
+ "ￌ"
+ "ﾠ"
+ "ￌ"
+ "ﾻ"
+ "ￌ"
+ "ﾠ"
+ "ￍ"
+ "ﾜ"
+ "r"
+ "ￌ"
+ "ﾨ"
+ "ￌ"
+ "ﾤ"
+ "ￍ"
+ "ﾍ"
+ "ￌ"
+ "ﾺ"
+ "ￌﾖￍﾔￌﾖￌﾖdￌﾠￌﾟￌﾭￌﾬￌﾝￍﾟiￌﾦￍﾖ"
+ "ￌ"
+ "ﾩ"
+ "ￍ"
+ "ﾓ"
+ "ￍ"
+ "ﾔ"
+ "ￌ"
+ "ﾤ"
+ "a"
+ "ￌ"
+ "ﾠ"
+ "ￌ"
+ "ﾗ"
+ "ￌ"
+ "ﾬ"
+ "ￍ"
+ "ﾉ"
+ "ￌ"
+ "ﾙ"
+ "n"
+ "ￍ"
+ "ﾚ"
+ "ￍ"
+ "ﾜ"
" "
"ￌﾻￌﾞￌﾰￍﾚￍﾅhￌﾵￍﾉiￌﾳￌﾞvￌﾢￍﾇ￡ﾸﾙￍﾎￍﾟ-ￒﾉￌﾭￌﾩￌﾼￍﾔmￌﾤￌﾭￌﾫiￍﾕￍﾇￌﾝￌﾦnￌﾗￍﾙ￡ﾸﾍￌﾟ "
"ￌﾯￌﾲￍﾕￍﾞￇﾫￌﾟￌﾯￌﾰￌﾲￍﾙￌﾻￌﾝf "
@@ -312,21 +824,92 @@
"ￒﾉZￌﾡￌﾖￌﾜￍﾖￌﾰￌﾣￍﾉￌﾜaￍﾖￌﾰￍﾙￌﾬￍﾡlￌﾲￌﾫￌﾳￍﾍￌﾩgￌﾡￌﾟￌﾼￌﾱￍﾚￌﾞￌﾬￍﾅoￌﾗￍﾜ.ￌﾟ",
"ￌﾦHￌﾬￌﾤￌﾗￌﾤￍﾝeￍﾜ ￌﾜￌﾥￌﾝￌﾻￍﾍￌﾟￌﾁwￌﾕhￌﾖￌﾯￍﾓoￌﾝￍﾙￌﾖￍﾎￌﾱￌﾮ "
"ￒﾉￌﾺￌﾙￌﾞￌﾟￍﾈWￌﾷￌﾼￌﾭaￌﾺￌﾪￍﾍￄﾯￍﾈￍﾕￌﾭￍﾙￌﾯￌﾜtￌﾶￌﾼￌﾮsￌﾘￍﾙￍﾖￌﾕ "
- "ￌﾠￌﾫￌﾠBￌﾻￍﾍￍﾙￍﾉￌﾳￍﾅeￌﾵhￌﾵￌﾬￍﾇￌﾫￍﾙiￌﾹￍﾓￌﾳￌﾳￌﾮￍﾎￌﾫￌﾕnￍﾟdￌﾴￌﾪￌﾜￌﾖ "
+ "ￌﾠￌﾫￌﾠBￌﾻￍﾍￍﾙￍﾉￌﾳￍﾅeￌﾵhￌﾵￌ"
+ "ﾬ"
+ "ￍ"
+ "ﾇ"
+ "ￌ"
+ "ﾫ"
+ "ￍ"
+ "ﾙ"
+ "i"
+ "ￌ"
+ "ﾹ"
+ "ￍ"
+ "ﾓ"
+ "ￌ"
+ "ﾳ"
+ "ￌ"
+ "ﾳ"
+ "ￌ"
+ "ﾮ"
+ "ￍ"
+ "ﾎ"
+ "ￌ"
+ "ﾫ"
+ "ￌ"
+ "ﾕ"
+ "n"
+ "ￍ"
+ "ﾟ"
+ "d"
+ "ￌ"
+ "ﾴ"
+ "ￌ"
+ "ﾪ"
+ "ￌ"
+ "ﾜ"
+ "ￌ"
+ "ﾖ"
+ " "
"ￌﾰￍﾉￌﾩￍﾇￍﾙￌﾲￍﾞￍﾅTￍﾖￌﾼￍﾓￌﾪￍﾢhￍﾏￍﾓￌﾮￌﾻeￌﾬￌﾝￌﾟￍﾅ "
"ￌﾤￌﾹￌﾝWￍﾙￌﾞￌﾝￍﾔￍﾇￍﾝￍﾅaￍﾏￍﾓￍﾔￌﾹￌﾼￌﾣlￌﾴￍﾔￌﾰￌﾤￌﾟￍﾔ￡ﾸﾽￌﾫ.ￍﾕ",
- "Zￌﾮￌﾞￌﾠￍﾙￍﾔￍﾅ￡ﾸﾀￌﾗￌﾞￍﾈￌﾻￌﾗ￡ﾸﾶￍﾙￍﾎￌﾯￌﾹￌﾞￍﾓGￌﾻOￌﾭￌﾗￌ"
+ "Zￌﾮￌﾞￌﾠￍﾙￍﾔￍﾅ￡ﾸﾀￌﾗￌﾞￍﾈￌﾻￌ"
+ "ﾗ"
+ "￡"
+ "ﾸ"
+ "ﾶ"
+ "ￍ"
+ "ﾙ"
+ "ￍ"
+ "ﾎ"
+ "ￌ"
+ "ﾯ"
+ "ￌ"
+ "ﾹ"
+ "ￌ"
+ "ﾞ"
+ "ￍ"
+ "ﾓ"
+ "G"
+ "ￌ"
+ "ﾻ"
+ "O"
+ "ￌ"
+ "ﾭ"
+ "ￌ"
+ "ﾗ"
+ "ￌ"
"ﾮ",
// Unicode Upsidedown
//
// Strings which contain unicode with an \"upsidedown\" effect (via
- //http://www.upsidedowntext.com)
+ // http://www.upsidedowntext.com)
- "ￋﾙﾐnb￡ﾴﾉlﾐ ﾐuￆﾃﾐﾯ ￇﾝﾹolop ￊﾇￇﾝ ￇﾝﾹoqﾐl ￊﾇn "
- "ￊﾇunp￡ﾴﾉp￡ﾴﾉﾔu￡ﾴﾉ ﾹodﾯￇﾝￊﾇ poﾯsn￡ﾴﾉￇﾝ op pￇﾝs "
+ "ￋﾙﾐnb￡ﾴﾉlﾐ ﾐuￆﾃﾐﾯ ￇﾝﾹolop "
+ "ￊﾇￇﾝ "
+ "ￇﾝﾹoqﾐl "
+ "ￊﾇn "
+ "ￊﾇunp￡ﾴﾉp￡ﾴﾉﾔu￡ﾴﾉ ﾹodﾯￇﾝￊﾇ "
+ "poﾯsn￡ﾴﾉￇﾝ "
+ "op "
+ "pￇﾝs "
"'ￊﾇ￡ﾴﾉlￇﾝ "
- "ￆﾃu￡ﾴﾉﾔs￡ﾴﾉd￡ﾴﾉpﾐ ﾹnￊﾇￇﾝￊﾇﾔￇﾝsuoﾔ 'ￊﾇￇﾝﾯﾐ ￊﾇ￡ﾴﾉs "
+ "ￆﾃu￡ﾴﾉﾔs￡ﾴﾉd￡ﾴﾉpﾐ "
+ "ﾹnￊﾇￇﾝￊﾇﾔￇﾝsuoﾔ "
+ "'ￊﾇￇﾝﾯﾐ "
+ "ￊﾇ￡ﾴﾉs "
"ﾹolop ﾯnsd￡ﾴﾉ "
"ﾯￇﾝﾹoￋﾥ",
"00ￋﾙￆﾖ$-",
@@ -335,55 +918,79 @@
//
// Strings which contain bold/italic/etc. versions of normal characters
- "ﾼﾴﾽﾈﾽﾅ ﾽﾑﾽﾕﾽﾉﾽﾃﾽﾋ ﾽﾂﾽﾒﾽﾏﾽﾗﾽﾎ "
- "ﾽﾆﾽﾏﾽﾘ ﾽﾊﾽﾕﾽﾍﾽﾐﾽﾓ ﾽﾏﾽﾖﾽﾅﾽﾒ "
+ "ﾼﾴﾽﾈﾽﾅ ﾽﾑﾽﾕﾽﾉﾽﾃﾽﾋ "
+ "ﾽﾂﾽﾒﾽﾏﾽﾗﾽﾎ "
+ "ﾽﾆﾽﾏﾽﾘ ﾽﾊﾽﾕﾽﾍﾽﾐﾽﾓ "
+ "ﾽﾏﾽﾖﾽﾅﾽﾒ "
"ﾽﾔﾽﾈﾽﾅ "
"ﾽﾌﾽﾁﾽﾚﾽﾙ ﾽﾄﾽﾏﾽﾇ",
- "ﾝﾐﾓﾝﾐﾡﾝﾐﾞ ﾝﾐﾪﾝﾐﾮﾝﾐﾢﾝﾐﾜﾝﾐﾤ "
- "ﾝﾐﾛﾝﾐﾫﾝﾐﾨﾝﾐﾰﾝﾐﾧ ﾝﾐﾟﾝﾐﾨﾝﾐﾱ "
+ "ﾝﾐﾓﾝﾐﾡﾝﾐﾞ "
+ "ﾝﾐﾪﾝﾐﾮﾝﾐﾢﾝﾐﾜﾝﾐﾤ "
+ "ﾝﾐﾛﾝﾐﾫﾝﾐﾨﾝﾐﾰﾝﾐﾧ "
+ "ﾝﾐﾟﾝﾐﾨﾝﾐﾱ "
"ﾝﾐﾣﾝﾐﾮﾝﾐﾦﾝﾐﾩﾝﾐﾬ "
- "ﾝﾐﾨﾝﾐﾯﾝﾐﾞﾝﾐﾫ ﾝﾐﾭﾝﾐﾡﾝﾐﾞ "
+ "ﾝﾐﾨﾝﾐﾯﾝﾐﾞﾝﾐﾫ "
+ "ﾝﾐﾭﾝﾐﾡﾝﾐﾞ "
"ﾝﾐﾥﾝﾐﾚﾝﾐﾳﾝﾐﾲ "
"ﾝﾐﾝﾝﾐﾨﾝﾐﾠ",
- "ﾝﾕﾝﾖﾍﾝﾖﾊ ﾝﾖﾖﾝﾖﾚﾝﾖﾎﾝﾖﾈﾝﾖﾐ "
- "ﾝﾖﾇﾝﾖﾗﾝﾖﾔﾝﾖﾜﾝﾖﾓ ﾝﾖﾋﾝﾖﾔﾝﾖﾝ "
+ "ﾝﾕﾝﾖﾍﾝﾖﾊ "
+ "ﾝﾖﾖﾝﾖﾚﾝﾖﾎﾝﾖﾈﾝﾖﾐ "
+ "ﾝﾖﾇﾝﾖﾗﾝﾖﾔﾝﾖﾜﾝﾖﾓ "
+ "ﾝﾖﾋﾝﾖﾔﾝﾖﾝ "
"ﾝﾖﾏﾝﾖﾚﾝﾖﾒﾝﾖﾕﾝﾖﾘ "
- "ﾝﾖﾔﾝﾖﾛﾝﾖﾊﾝﾖﾗ ﾝﾖﾙﾝﾖﾍﾝﾖﾊ "
+ "ﾝﾖﾔﾝﾖﾛﾝﾖﾊﾝﾖﾗ "
+ "ﾝﾖﾙﾝﾖﾍﾝﾖﾊ "
"ﾝﾖﾑﾝﾖﾆﾝﾖﾟﾝﾖﾞ "
"ﾝﾖﾉﾝﾖﾔﾝﾖﾌ",
- "ﾝﾑﾻﾝﾒﾉﾝﾒﾆ ﾝﾒﾒﾝﾒﾖﾝﾒﾊﾝﾒﾄﾝﾒﾌ "
- "ﾝﾒﾃﾝﾒﾓﾝﾒﾐﾝﾒﾘﾝﾒﾏ ﾝﾒﾇﾝﾒﾐﾝﾒﾙ "
+ "ﾝﾑﾻﾝﾒﾉﾝﾒﾆ "
+ "ﾝﾒﾒﾝﾒﾖﾝﾒﾊﾝﾒﾄﾝﾒﾌ "
+ "ﾝﾒﾃﾝﾒﾓﾝﾒﾐﾝﾒﾘﾝﾒﾏ "
+ "ﾝﾒﾇﾝﾒﾐﾝﾒﾙ "
"ﾝﾒﾋﾝﾒﾖﾝﾒﾎﾝﾒﾑﾝﾒﾔ "
- "ﾝﾒﾐﾝﾒﾗﾝﾒﾆﾝﾒﾓ ﾝﾒﾕﾝﾒﾉﾝﾒﾆ "
+ "ﾝﾒﾐﾝﾒﾗﾝﾒﾆﾝﾒﾓ "
+ "ﾝﾒﾕﾝﾒﾉﾝﾒﾆ "
"ﾝﾒﾍﾝﾒﾂﾝﾒﾛﾝﾒﾚ "
"ﾝﾒﾅﾝﾒﾐﾝﾒﾈ",
- "ﾝﾓﾣﾝﾓﾱﾝﾓﾮ ﾝﾓﾺﾝﾓﾾﾝﾓﾲﾝﾓﾬﾝﾓﾴ "
- "ﾝﾓﾫﾝﾓﾻﾝﾓﾸﾝﾔﾀﾝﾓﾷ ﾝﾓﾯﾝﾓﾸﾝﾔﾁ "
+ "ﾝﾓﾣﾝﾓﾱﾝﾓﾮ "
+ "ﾝﾓﾺﾝﾓﾾﾝﾓﾲﾝﾓﾬﾝﾓﾴ "
+ "ﾝﾓﾫﾝﾓﾻﾝﾓﾸﾝﾔﾀﾝﾓﾷ "
+ "ﾝﾓﾯﾝﾓﾸﾝﾔﾁ "
"ﾝﾓﾳﾝﾓﾾﾝﾓﾶﾝﾓﾹﾝﾓﾼ "
- "ﾝﾓﾸﾝﾓﾝﾓﾮﾝﾓﾻ ﾝﾓﾽﾝﾓﾱﾝﾓﾮ "
+ "ﾝﾓﾸﾝﾓﾝﾓﾮﾝﾓﾻ "
+ "ﾝﾓﾽﾝﾓﾱﾝﾓﾮ "
"ﾝﾓﾵﾝﾓﾪﾝﾔﾃﾝﾔﾂ "
"ﾝﾓﾭﾝﾓﾸﾝﾓﾰ",
- "ﾝﾕﾋﾝﾕﾙﾝﾕﾖ ﾝﾕﾢﾝﾕﾦﾝﾕﾚﾝﾕﾔﾝﾕﾜ "
- "ﾝﾕﾓﾝﾕﾣﾝﾕﾠﾝﾕﾨﾝﾕﾟ ﾝﾕﾗﾝﾕﾠﾝﾕﾩ "
+ "ﾝﾕﾋﾝﾕﾙﾝﾕﾖ "
+ "ﾝﾕﾢﾝﾕﾦﾝﾕﾚﾝﾕﾔﾝﾕﾜ "
+ "ﾝﾕﾓﾝﾕﾣﾝﾕﾠﾝﾕﾨﾝﾕﾟ "
+ "ﾝﾕﾗﾝﾕﾠﾝﾕﾩ "
"ﾝﾕﾛﾝﾕﾦﾝﾕﾞﾝﾕﾡﾝﾕﾤ "
- "ﾝﾕﾠﾝﾕﾧﾝﾕﾖﾝﾕﾣ ﾝﾕﾥﾝﾕﾙﾝﾕﾖ "
+ "ﾝﾕﾠﾝﾕﾧﾝﾕﾖﾝﾕﾣ "
+ "ﾝﾕﾥﾝﾕﾙﾝﾕﾖ "
"ﾝﾕﾝﾝﾕﾒﾝﾕﾫﾝﾕﾪ "
"ﾝﾕﾕﾝﾕﾠﾝﾕﾘ",
- "ﾝﾚﾃﾝﾚﾑﾝﾚﾎ ﾝﾚﾚﾝﾚﾞﾝﾚﾒﾝﾚﾌﾝﾚﾔ "
- "ﾝﾚﾋﾝﾚﾛﾝﾚﾘﾝﾚﾠﾝﾚﾗ ﾝﾚﾏﾝﾚﾘﾝﾚﾡ "
+ "ﾝﾚﾃﾝﾚﾑﾝﾚﾎ "
+ "ﾝﾚﾚﾝﾚﾞﾝﾚﾒﾝﾚﾌﾝﾚﾔ "
+ "ﾝﾚﾋﾝﾚﾛﾝﾚﾘﾝﾚﾠﾝﾚﾗ "
+ "ﾝﾚﾏﾝﾚﾘﾝﾚﾡ "
"ﾝﾚﾓﾝﾚﾞﾝﾚﾖﾝﾚﾙﾝﾚﾜ "
- "ﾝﾚﾘﾝﾚﾟﾝﾚﾎﾝﾚﾛ ﾝﾚﾝﾝﾚﾑﾝﾚﾎ "
+ "ﾝﾚﾘﾝﾚﾟﾝﾚﾎﾝﾚﾛ "
+ "ﾝﾚﾝﾝﾚﾑﾝﾚﾎ "
"ﾝﾚﾕﾝﾚﾊﾝﾚﾣﾝﾚﾢ "
"ﾝﾚﾍﾝﾚﾘﾝﾚﾐ",
- "￢ﾒﾯ￢ﾒﾣ￢ﾒﾠ ￢ﾒﾬ￢ﾒﾰ￢ﾒﾤ￢ﾒﾞ￢ﾒﾦ ￢ﾒﾝ￢ﾒﾭ￢ﾒﾪ￢ﾒﾲ￢ﾒﾩ ￢ﾒﾡ￢ﾒﾪ￢ﾒﾳ "
- "￢ﾒﾥ￢ﾒﾰ￢ﾒﾨ￢ﾒﾫ￢ﾒﾮ ￢ﾒﾪ￢ﾒﾱ￢ﾒﾠ￢ﾒﾭ ￢ﾒﾯ￢ﾒﾣ￢ﾒﾠ "
+ "￢ﾒﾯ￢ﾒﾣ￢ﾒﾠ ￢ﾒﾬ￢ﾒﾰ￢ﾒﾤ￢ﾒﾞ￢ﾒﾦ "
+ "￢ﾒﾝ￢ﾒﾭ￢ﾒﾪ￢ﾒﾲ￢ﾒﾩ "
+ "￢ﾒﾡ￢ﾒﾪ￢ﾒﾳ "
+ "￢ﾒﾥ￢ﾒﾰ￢ﾒﾨ￢ﾒﾫ￢ﾒﾮ "
+ "￢ﾒﾪ￢ﾒﾱ￢ﾒﾠ￢ﾒﾭ "
+ "￢ﾒﾯ￢ﾒﾣ￢ﾒﾠ "
"￢ﾒﾧ￢ﾒﾜ￢ﾒﾵ￢ﾒﾴ "
"￢ﾒﾟ￢ﾒﾪ￢ﾒﾢ",
// Script Injection
//
// Strings which attempt to invoke a benign script injection; shows
- //vulnerability to XSS
+ // vulnerability to XSS
"<script>alert(123)</script>",
"<script>alert('123');</script>",
@@ -705,7 +1312,7 @@
// XXE Injection (XML)
//
// String which can reveal system files when parsed by a badly configured
- //XML parser
+ // XML parser
"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><!DOCTYPE foo [ <!ELEMENT "
"foo ANY ><!ENTITY xxe SYSTEM \"file:///etc/passwd\" >]><foo>&xxe;</foo>",
@@ -713,8 +1320,9 @@
// Unwanted Interpolation
//
// Strings which can be accidentally expanded into different strings if
- //evaluated in the wrong context, e.g. used as a printf format string or via
- //Perl or
+ // evaluated in the wrong context, e.g. used as a printf format string or
+ // via
+ // Perl or
// shell eval. Might expose sensitive data from the program doing the
// interpolation, or might just represent the wrong string.
@@ -723,7 +1331,7 @@
// File Inclusion
//
// Strings which can cause user to pull in files that should not be a part
- //of a web server
+ // of a web server
"../../../../../../../../../../../etc/passwd%00",
"../../../../../../../../../../../etc/hosts",
@@ -785,7 +1393,20 @@
//
// Strings which crashed iMessage in various versions of iOS
- "Powerﾄﾏﾄﾏﾵﾑﾨﾏﾄﾏﾄﾵﾑﾨﾏﾱﾱ"
+ "Powerﾄﾏﾄﾏﾵﾑﾨﾏﾄﾏﾄ"
+ "ﾵ"
+ ""
+ "ﾑ"
+ ""
+ "ﾨ"
+ ""
+ "ﾏ"
+ ""
+ "ﾱ"
+ ""
+ "ﾱ"
"ﾋ ￠ﾥﾣ ￠ﾥﾣh ￠ﾥﾣ "
"￠ﾥﾣ￥ﾆﾗ",
- "ﾟﾏﾳ0ﾟﾌﾈﾸﾏ"};
\ No newline at end of file
+ "ﾟﾏﾳ0ﾟﾌﾈﾸﾏ"};
+
+// clang-format on
\ No newline at end of file
diff --git a/include/gzip_helper.hpp b/include/gzip_helper.hpp
index e577c1f..e14fc1b 100644
--- a/include/gzip_helper.hpp
+++ b/include/gzip_helper.hpp
@@ -5,7 +5,7 @@
#include <string>
inline bool gzipInflate(const std::string& compressedBytes,
- std::string& uncompressedBytes) {
+ std::string& uncompressedBytes) {
if (compressedBytes.empty()) {
uncompressedBytes = compressedBytes;
return true;
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 1f3b9e2..ad6104b 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -53,8 +53,8 @@
// if we're the last outstanding caller, finish the request
if (transaction.use_count() == 1) {
res.jsonValue = {{"status", "ok"},
- {"bus_name", processName},
- {"objects", std::move(*transaction)}};
+ {"bus_name", processName},
+ {"objects", std::move(*transaction)}};
res.end();
}
},
@@ -198,7 +198,7 @@
const nlohmann::json &input_json) {
int r = 0;
BMCWEB_LOG_DEBUG << "Converting " << input_json.dump()
- << " to type: " << arg_type;
+ << " to type: " << arg_type;
const std::vector<std::string> arg_types = dbus_arg_split(arg_type);
// Assume a single object for now.
@@ -335,7 +335,7 @@
} else if (boost::starts_with(arg_code, "v")) {
std::string contained_type = arg_code.substr(1);
BMCWEB_LOG_DEBUG << "variant type: " << arg_code
- << " appending variant of type: " << contained_type;
+ << " appending variant of type: " << contained_type;
r = sd_bus_message_open_container(m, SD_BUS_TYPE_VARIANT,
contained_type.c_str());
if (r < 0) {
@@ -408,7 +408,7 @@
void find_action_on_interface(std::shared_ptr<InProgressActionData> transaction,
const std::string &connectionName) {
BMCWEB_LOG_DEBUG << "find_action_on_interface for connection "
- << connectionName;
+ << connectionName;
crow::connections::systemBus->async_method_call(
[
transaction, connectionName{std::string(connectionName)}
@@ -416,16 +416,16 @@
BMCWEB_LOG_DEBUG << "got xml:\n " << introspect_xml;
if (ec) {
BMCWEB_LOG_ERROR << "Introspect call failed with error: "
- << ec.message() << " on process: " << connectionName
- << "\n";
+ << ec.message() << " on process: " << connectionName
+ << "\n";
} else {
tinyxml2::XMLDocument doc;
doc.Parse(introspect_xml.c_str());
tinyxml2::XMLNode *pRoot = doc.FirstChildElement("node");
if (pRoot == nullptr) {
- BMCWEB_LOG_ERROR << "XML document failed to parse " << connectionName
- << "\n";
+ BMCWEB_LOG_ERROR << "XML document failed to parse "
+ << connectionName << "\n";
} else {
tinyxml2::XMLElement *interface_node =
@@ -478,8 +478,8 @@
return;
}
transaction->res.jsonValue = {{"status", "ok"},
- {"message", "200 OK"},
- {"data", nullptr}};
+ {"message", "200 OK"},
+ {"data", nullptr}};
});
break;
}
@@ -526,7 +526,7 @@
}
BMCWEB_LOG_DEBUG << "GetObject returned objects "
- << interface_names.size();
+ << interface_names.size();
for (const std::pair<std::string, std::vector<std::string>> &object :
interface_names) {
@@ -546,8 +546,8 @@
res.result(boost::beast::http::status::internal_server_error);
} else {
res.jsonValue = {{"status", "ok"},
- {"message", "200 OK"},
- {"data", std::move(objectPaths)}};
+ {"message", "200 OK"},
+ {"data", std::move(objectPaths)}};
}
res.end();
},
@@ -563,8 +563,8 @@
const GetSubTreeType &object_names) {
if (ec) {
res.jsonValue = {{"message", "200 OK"},
- {"status", "ok"},
- {"data", nlohmann::json::object()}};
+ {"status", "ok"},
+ {"data", nlohmann::json::object()}};
res.end();
return;
@@ -597,14 +597,15 @@
void handle_get(crow::Response &res, std::string &object_path,
std::string &dest_property) {
- BMCWEB_LOG_DEBUG << "handle_get: " << object_path << " prop:" << dest_property;
+ BMCWEB_LOG_DEBUG << "handle_get: " << object_path
+ << " prop:" << dest_property;
std::shared_ptr<std::string> property_name =
std::make_shared<std::string>(dest_property);
using GetObjectType =
std::vector<std::pair<std::string, std::vector<std::string>>>;
crow::connections::systemBus->async_method_call(
[&res, object_path, property_name](const boost::system::error_code ec,
- const GetObjectType &object_names) {
+ const GetObjectType &object_names) {
if (ec || object_names.size() <= 0) {
res.result(boost::beast::http::status::not_found);
res.end();
@@ -653,8 +654,8 @@
}
if (response.use_count() == 1) {
res.jsonValue = {{"status", "ok"},
- {"message", "200 OK"},
- {"data", *response}};
+ {"message", "200 OK"},
+ {"data", *response}};
res.end();
}
@@ -761,7 +762,7 @@
tinyxml2::XMLNode *pRoot = doc.FirstChildElement("node");
if (pRoot == nullptr) {
BMCWEB_LOG_ERROR << "XML document failed to parse: "
- << introspectXml;
+ << introspectXml;
transaction->setErrorStatus();
return;
}
@@ -1004,9 +1005,8 @@
}
if (interfaceName.empty()) {
crow::connections::systemBus->async_method_call(
- [&, processName, objectPath](
- const boost::system::error_code ec,
- const std::string &introspect_xml) {
+ [&, processName, objectPath](const boost::system::error_code ec,
+ const std::string &introspect_xml) {
if (ec) {
BMCWEB_LOG_ERROR
<< "Introspect call failed with error: " << ec.message()
diff --git a/redfish-core/include/node.hpp b/redfish-core/include/node.hpp
index ebd8989..20d2951 100644
--- a/redfish-core/include/node.hpp
+++ b/redfish-core/include/node.hpp
@@ -74,14 +74,14 @@
void getSubRoutes(const std::vector<std::unique_ptr<Node>>& allNodes) {
const std::string* url = getUrl();
if (url == nullptr) {
- //BMCWEB_LOG_CRITICAL << "Unable to get url for route";
+ // BMCWEB_LOG_CRITICAL << "Unable to get url for route";
return;
}
for (const auto& node : allNodes) {
const std::string* route = node->getUrl();
if (route == nullptr) {
- //BMCWEB_LOG_CRITICAL << "Unable to get url for route";
+ // BMCWEB_LOG_CRITICAL << "Unable to get url for route";
continue;
}
if (boost::starts_with(*route, *url)) {
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 4c44527..aa8d66f 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -390,17 +390,18 @@
const std::string &name,
const std::string &newValue,
const std::shared_ptr<AsyncResp> &asyncResp) {
- auto callback =
- [asyncResp, ipIdx{std::move(ipIdx)}, name{std::move(name)},
- newValue{std::move(newValue)}](const boost::system::error_code ec) {
- if (ec) {
- messages::addMessageToJson(
- asyncResp->res.jsonValue, messages::internalError(),
- "/IPv4Addresses/" + std::to_string(ipIdx) + "/" + name);
- } else {
- asyncResp->res.jsonValue["IPv4Addresses"][ipIdx][name] = newValue;
- }
- };
+ auto callback = [
+ asyncResp, ipIdx{std::move(ipIdx)}, name{std::move(name)},
+ newValue{std::move(newValue)}
+ ](const boost::system::error_code ec) {
+ if (ec) {
+ messages::addMessageToJson(
+ asyncResp->res.jsonValue, messages::internalError(),
+ "/IPv4Addresses/" + std::to_string(ipIdx) + "/" + name);
+ } else {
+ asyncResp->res.jsonValue["IPv4Addresses"][ipIdx][name] = newValue;
+ }
+ };
crow::connections::systemBus->async_method_call(
std::move(callback), "xyz.openbmc_project.Network",
@@ -428,17 +429,17 @@
const std::string &newValueDbus,
const std::shared_ptr<AsyncResp> &asyncResp) {
auto callback =
- [asyncResp, ipIdx{std::move(ipIdx)},
- newValue{std::move(newValue)}](const boost::system::error_code ec) {
- if (ec) {
- messages::addMessageToJson(
- asyncResp->res.jsonValue, messages::internalError(),
- "/IPv4Addresses/" + std::to_string(ipIdx) + "/AddressOrigin");
- } else {
- asyncResp->res.jsonValue["IPv4Addresses"][ipIdx]["AddressOrigin"] =
- newValue;
- }
- };
+ [ asyncResp, ipIdx{std::move(ipIdx)},
+ newValue{std::move(newValue)} ](const boost::system::error_code ec) {
+ if (ec) {
+ messages::addMessageToJson(
+ asyncResp->res.jsonValue, messages::internalError(),
+ "/IPv4Addresses/" + std::to_string(ipIdx) + "/AddressOrigin");
+ } else {
+ asyncResp->res.jsonValue["IPv4Addresses"][ipIdx]["AddressOrigin"] =
+ newValue;
+ }
+ };
crow::connections::systemBus->async_method_call(
std::move(callback), "xyz.openbmc_project.Network",
@@ -464,9 +465,9 @@
const std::string &ifaceId, int ipIdx, const std::string &ipHash,
const std::string &newValueStr, uint8_t &newValue,
const std::shared_ptr<AsyncResp> &asyncResp) {
- auto callback = [asyncResp, ipIdx{std::move(ipIdx)},
- newValueStr{std::move(newValueStr)}](
- const boost::system::error_code ec) {
+ auto callback = [
+ asyncResp, ipIdx{std::move(ipIdx)}, newValueStr{std::move(newValueStr)}
+ ](const boost::system::error_code ec) {
if (ec) {
messages::addMessageToJson(
asyncResp->res.jsonValue, messages::internalError(),
@@ -533,8 +534,8 @@
unsigned int ipIdx,
const std::shared_ptr<AsyncResp> &asyncResp) {
crow::connections::systemBus->async_method_call(
- [ipIdx{std::move(ipIdx)},
- asyncResp{std::move(asyncResp)}](const boost::system::error_code ec) {
+ [ ipIdx{std::move(ipIdx)}, asyncResp{std::move(asyncResp)} ](
+ const boost::system::error_code ec) {
if (ec) {
messages::addMessageToJson(
asyncResp->res.jsonValue, messages::internalError(),
@@ -562,15 +563,15 @@
uint8_t subnetMask, const std::string &gateway,
const std::string &address,
const std::shared_ptr<AsyncResp> &asyncResp) {
- auto createIpHandler =
- [ipIdx{std::move(ipIdx)},
- asyncResp{std::move(asyncResp)}](const boost::system::error_code ec) {
- if (ec) {
- messages::addMessageToJson(
- asyncResp->res.jsonValue, messages::internalError(),
- "/IPv4Addresses/" + std::to_string(ipIdx) + "/");
- }
- };
+ auto createIpHandler = [
+ ipIdx{std::move(ipIdx)}, asyncResp{std::move(asyncResp)}
+ ](const boost::system::error_code ec) {
+ if (ec) {
+ messages::addMessageToJson(
+ asyncResp->res.jsonValue, messages::internalError(),
+ "/IPv4Addresses/" + std::to_string(ipIdx) + "/");
+ }
+ };
crow::connections::systemBus->async_method_call(
std::move(createIpHandler), "xyz.openbmc_project.Network",
@@ -640,10 +641,11 @@
void getEthernetIfaceData(const std::string ðifaceId,
CallbackFunc &&callback) {
crow::connections::systemBus->async_method_call(
- [this, ethifaceId{std::move(ethifaceId)},
- callback{std::move(callback)}](
- const boost::system::error_code error_code,
- const GetManagedObjectsType &resp) {
+ [
+ this, ethifaceId{std::move(ethifaceId)}, callback{std::move(callback)}
+ ](const boost::system::error_code error_code,
+ const GetManagedObjectsType &resp) {
+
EthernetInterfaceData ethData{};
std::vector<IPv4AddressData> ipv4Data;
ipv4Data.reserve(maxIpV4AddressesPerInterface);
@@ -693,7 +695,7 @@
template <typename CallbackFunc>
void getEthernetIfaceList(CallbackFunc &&callback) {
crow::connections::systemBus->async_method_call(
- [this, callback{std::move(callback)}](
+ [ this, callback{std::move(callback)} ](
const boost::system::error_code error_code,
GetManagedObjectsType &resp) {
// Callback requires vector<string> to retrieve all available ethernet
@@ -776,27 +778,26 @@
std::string managerId = "openbmc";
// get eth interface list, and call the below callback for JSON preparation
- ethernetProvider.getEthernetIfaceList(
- [&, managerId{std::move(managerId)}](
- const bool &success, const std::vector<std::string> &iface_list) {
- if (success) {
- nlohmann::json ifaceArray = nlohmann::json::array();
- for (const std::string &ifaceItem : iface_list) {
- ifaceArray.push_back(
- {{"@odata.id", "/redfish/v1/Managers/" + managerId +
- "/EthernetInterfaces/" + ifaceItem}});
- }
- Node::json["Members"] = ifaceArray;
- Node::json["Members@odata.count"] = ifaceArray.size();
- Node::json["@odata.id"] =
- "/redfish/v1/Managers/" + managerId + "/EthernetInterfaces";
- res.jsonValue = Node::json;
- } else {
- // No success, best what we can do is return INTERNALL ERROR
- res.result(boost::beast::http::status::internal_server_error);
- }
- res.end();
- });
+ ethernetProvider.getEthernetIfaceList([&, managerId{std::move(managerId)} ](
+ const bool &success, const std::vector<std::string> &iface_list) {
+ if (success) {
+ nlohmann::json ifaceArray = nlohmann::json::array();
+ for (const std::string &ifaceItem : iface_list) {
+ ifaceArray.push_back(
+ {{"@odata.id", "/redfish/v1/Managers/" + managerId +
+ "/EthernetInterfaces/" + ifaceItem}});
+ }
+ Node::json["Members"] = ifaceArray;
+ Node::json["Members@odata.count"] = ifaceArray.size();
+ Node::json["@odata.id"] =
+ "/redfish/v1/Managers/" + managerId + "/EthernetInterfaces";
+ res.jsonValue = Node::json;
+ } else {
+ // No success, best what we can do is return INTERNALL ERROR
+ res.result(boost::beast::http::status::internal_server_error);
+ }
+ res.end();
+ });
}
// Ethernet Provider object
@@ -902,7 +903,7 @@
paramsJson["VLANId"] = inputVlanId;
OnDemandEthernetProvider::changeVlanId(
ifaceId, static_cast<uint32_t>(inputVlanId),
- [&, asyncResp, pathPrefx{std::move(pathPrefix)}](
+ [&, asyncResp, pathPrefx{std::move(pathPrefix)} ](
const boost::system::error_code ec) {
if (ec) {
messages::addMessageToJson(asyncResp->res.jsonValue,
@@ -914,7 +915,7 @@
} else if (inputVlanEnabled == false) {
// Disable VLAN
OnDemandEthernetProvider::disableVlan(
- ifaceId, [&, asyncResp, pathPrefx{std::move(pathPrefix)}](
+ ifaceId, [&, asyncResp, pathPrefx{std::move(pathPrefix)} ](
const boost::system::error_code ec) {
if (ec) {
messages::addMessageToJson(asyncResp->res.jsonValue,
@@ -1286,7 +1287,7 @@
// get single eth interface data, and call the below callback for JSON
// preparation
ethernetProvider.getEthernetIfaceData(
- ifaceId, [&, ifaceId, patchReq = std::move(patchReq)](
+ ifaceId, [&, ifaceId, patchReq = std::move(patchReq) ](
const bool &success, const EthernetInterfaceData ð_data,
const std::vector<IPv4AddressData> &ipv4_data) {
if (!success) {
@@ -1482,7 +1483,7 @@
// Get single eth interface data, and call the below callback for JSON
// preparation
ethernetProvider.getEthernetIfaceData(
- ifaceId, [&, parent_ifaceId, ifaceId, patchReq = std::move(patchReq)](
+ ifaceId, [&, parent_ifaceId, ifaceId, patchReq = std::move(patchReq) ](
const bool &success, const EthernetInterfaceData ð_data,
const std::vector<IPv4AddressData> &ipv4_data) {
if (!success) {
@@ -1644,47 +1645,45 @@
std::string rootInterfaceName = params[0];
// get eth interface list, and call the below callback for JSON preparation
- ethernetProvider.getEthernetIfaceList(
- [&, managerId{std::move(managerId)},
- rootInterfaceName{std::move(rootInterfaceName)}](
- const bool &success, const std::vector<std::string> &iface_list) {
- if (success) {
- bool rootInterfaceFound = false;
- nlohmann::json ifaceArray = nlohmann::json::array();
+ ethernetProvider.getEthernetIfaceList([
+ &, managerId{std::move(managerId)},
+ rootInterfaceName{std::move(rootInterfaceName)}
+ ](const bool &success, const std::vector<std::string> &iface_list) {
+ if (success) {
+ bool rootInterfaceFound = false;
+ nlohmann::json ifaceArray = nlohmann::json::array();
- for (const std::string &ifaceItem : iface_list) {
- if (ifaceItem == rootInterfaceName) {
- rootInterfaceFound = true;
- } else if (boost::starts_with(ifaceItem,
- rootInterfaceName + "_")) {
- ifaceArray.push_back(
- {{"@odata.id", "/redfish/v1/Managers/" + managerId +
- "/EthernetInterfaces/" +
- rootInterfaceName + "/VLANs/" +
- ifaceItem}});
- }
- }
-
- if (rootInterfaceFound) {
- Node::json["Members"] = ifaceArray;
- Node::json["Members@odata.count"] = ifaceArray.size();
- Node::json["@odata.id"] = "/redfish/v1/Managers/" + managerId +
- "/EthernetInterfaces/" +
- rootInterfaceName + "/VLANs";
- res.jsonValue = Node::json;
- } else {
- messages::addMessageToErrorJson(
- res.jsonValue, messages::resourceNotFound("EthernetInterface",
- rootInterfaceName));
- res.result(boost::beast::http::status::not_found);
- res.end();
- }
- } else {
- // No success, best what we can do is return INTERNALL ERROR
- res.result(boost::beast::http::status::internal_server_error);
+ for (const std::string &ifaceItem : iface_list) {
+ if (ifaceItem == rootInterfaceName) {
+ rootInterfaceFound = true;
+ } else if (boost::starts_with(ifaceItem, rootInterfaceName + "_")) {
+ ifaceArray.push_back(
+ {{"@odata.id", "/redfish/v1/Managers/" + managerId +
+ "/EthernetInterfaces/" + rootInterfaceName +
+ "/VLANs/" + ifaceItem}});
}
+ }
+
+ if (rootInterfaceFound) {
+ Node::json["Members"] = ifaceArray;
+ Node::json["Members@odata.count"] = ifaceArray.size();
+ Node::json["@odata.id"] = "/redfish/v1/Managers/" + managerId +
+ "/EthernetInterfaces/" + rootInterfaceName +
+ "/VLANs";
+ res.jsonValue = Node::json;
+ } else {
+ messages::addMessageToErrorJson(
+ res.jsonValue, messages::resourceNotFound("EthernetInterface",
+ rootInterfaceName));
+ res.result(boost::beast::http::status::not_found);
res.end();
- });
+ }
+ } else {
+ // No success, best what we can do is return INTERNALL ERROR
+ res.result(boost::beast::http::status::internal_server_error);
+ }
+ res.end();
+ });
}
void doPost(crow::Response &res, const crow::Request &req,
@@ -1719,49 +1718,49 @@
}
// get eth interface list, and call the below callback for JSON preparation
- ethernetProvider.getEthernetIfaceList(
- [&, managerId{std::move(managerId)},
- rootInterfaceName{std::move(rootInterfaceName)}](
- const bool &success, const std::vector<std::string> &iface_list) {
- if (success) {
- bool rootInterfaceFound = false;
+ ethernetProvider.getEthernetIfaceList([
+ &, managerId{std::move(managerId)},
+ rootInterfaceName{std::move(rootInterfaceName)}
+ ](const bool &success, const std::vector<std::string> &iface_list) {
+ if (success) {
+ bool rootInterfaceFound = false;
- for (const std::string &ifaceItem : iface_list) {
- if (ifaceItem == rootInterfaceName) {
- rootInterfaceFound = true;
- break;
- }
- }
-
- if (rootInterfaceFound) {
- ethernetProvider.createVlan(
- rootInterfaceName, vlanId,
- [&, vlanId, rootInterfaceName,
- req{std::move(req)}](const boost::system::error_code ec) {
- if (ec) {
- messages::addMessageToErrorJson(
- res.jsonValue, messages::internalError());
- res.end();
- } else {
- memberVlan.doGet(
- res, req,
- {rootInterfaceName,
- rootInterfaceName + "_" + std::to_string(vlanId)});
- }
- });
- } else {
- messages::addMessageToErrorJson(
- res.jsonValue, messages::resourceNotFound("EthernetInterface",
- rootInterfaceName));
- res.result(boost::beast::http::status::not_found);
- res.end();
- }
- } else {
- // No success, best what we can do is return INTERNALL ERROR
- res.result(boost::beast::http::status::internal_server_error);
- res.end();
+ for (const std::string &ifaceItem : iface_list) {
+ if (ifaceItem == rootInterfaceName) {
+ rootInterfaceFound = true;
+ break;
}
- });
+ }
+
+ if (rootInterfaceFound) {
+ ethernetProvider.createVlan(
+ rootInterfaceName, vlanId,
+ [&, vlanId, rootInterfaceName,
+ req{std::move(req)} ](const boost::system::error_code ec) {
+ if (ec) {
+ messages::addMessageToErrorJson(res.jsonValue,
+ messages::internalError());
+ res.end();
+ } else {
+ memberVlan.doGet(
+ res, req,
+ {rootInterfaceName,
+ rootInterfaceName + "_" + std::to_string(vlanId)});
+ }
+ });
+ } else {
+ messages::addMessageToErrorJson(
+ res.jsonValue, messages::resourceNotFound("EthernetInterface",
+ rootInterfaceName));
+ res.result(boost::beast::http::status::not_found);
+ res.end();
+ }
+ } else {
+ // No success, best what we can do is return INTERNALL ERROR
+ res.result(boost::beast::http::status::internal_server_error);
+ res.end();
+ }
+ });
}
// Ethernet Provider object
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 836249a..f1c3d92 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -116,7 +116,7 @@
};
BMCWEB_LOG_DEBUG << "Get available system components.";
crow::connections::systemBus->async_method_call(
- [name, aResp{std::move(aResp)}](
+ [ name, aResp{std::move(aResp)} ](
const boost::system::error_code ec,
const std::vector<std::pair<
std::string,
@@ -146,7 +146,7 @@
BMCWEB_LOG_DEBUG << "Found name: " << name;
const std::string connectionName = connectionNames[0].first;
crow::connections::systemBus->async_method_call(
- [aResp, name(std::string(name))](
+ [ aResp, name(std::string(name)) ](
const boost::system::error_code ec,
const std::vector<std::pair<std::string, VariantType>>
&propertiesList) {
@@ -332,9 +332,9 @@
CallbackFunc &&callback) {
BMCWEB_LOG_DEBUG << "Get led groups";
crow::connections::systemBus->async_method_call(
- [aResp{std::move(aResp)}, &callback](
- const boost::system::error_code &ec,
- const ManagedObjectsType &resp) {
+ [
+ aResp{std::move(aResp)}, &callback
+ ](const boost::system::error_code &ec, const ManagedObjectsType &resp) {
if (ec) {
BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
aResp->setErrorStatus();
@@ -372,8 +372,9 @@
CallbackFunc &&callback) {
BMCWEB_LOG_DEBUG << "Get identify led properties";
crow::connections::systemBus->async_method_call(
- [aResp{std::move(aResp)}, &callback](const boost::system::error_code ec,
- const PropertiesType &properties) {
+ [ aResp{std::move(aResp)}, &callback ](
+ const boost::system::error_code ec,
+ const PropertiesType &properties) {
if (ec) {
BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
aResp->setErrorStatus();
@@ -645,7 +646,7 @@
// Update led group
BMCWEB_LOG_DEBUG << "Update led group.";
crow::connections::systemBus->async_method_call(
- [&, asyncResp{std::move(asyncResp)}](
+ [&, asyncResp{std::move(asyncResp)} ](
const boost::system::error_code ec) {
if (ec) {
BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
@@ -663,7 +664,7 @@
// Update identify led status
BMCWEB_LOG_DEBUG << "Update led SoftwareInventoryCollection.";
crow::connections::systemBus->async_method_call(
- [&, asyncResp{std::move(asyncResp)}](
+ [&, asyncResp{std::move(asyncResp)} ](
const boost::system::error_code ec) {
if (ec) {
BMCWEB_LOG_DEBUG << "DBUS response error " << ec;