Bug 1254918, a few manual fixes after clang-format in nss/cmd, r=martin.thomson

3 files changed, 49 insertions, 46 deletions

diff --git a/cmd/addbuiltin/addbuiltin.c b/cmd/addbuiltin/addbuiltin.c
index 3da6652a3..9ecad3d64 100644
--- a/cmd/addbuiltin/addbuiltin.c
+++ b/cmd/addbuiltin/addbuiltin.c
@@ -269,9 +269,6 @@ printheader()
            "# License, v. 2.0. If a copy of the MPL was not distributed with this\n"
            "# file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
            "#\n"
-           "CVS_ID \"@(#) $RCSfile$ $Revision$ $Date$\"\n"
-           "\n"
-           "#\n"
            "# certdata.txt\n"
            "#\n"
            "# This file contains the object definitions for the certs and other\n"
diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
index e02b3476f..e1acc7024 100644
--- a/cmd/bltest/blapitest.c
+++ b/cmd/bltest/blapitest.c
@@ -985,9 +985,7 @@ setupIO(PLArenaPool *arena, bltestIO *input, PRFileDesc *file,
             break;
         case bltestHexSpaceDelim:
             SECITEM_AllocItem(arena, &input->buf, in->len / 5);
-            for (i = 0, j = 0; i <
-                               in->len;
-                 i += 5, j++) {
+            for (i = 0, j = 0; i < in->len; i += 5, j++) {
                 tok = &in->data[i];
                 if (tok[0] != '0' || tok[1] != 'x' || tok[4] != ' ')
                     /* bad hex token */
@@ -1000,9 +998,7 @@ setupIO(PLArenaPool *arena, bltestIO *input, PRFileDesc *file,
             break;
         case bltestHexStream:
             SECITEM_AllocItem(arena, &input->buf, in->len / 2);
-            for (i = 0, j = 0; i <
-                               in->len;
-                 i += 2, j++) {
+            for (i = 0, j = 0; i < in->len; i += 2, j++) {
                 tok = &in->data[i];
                 rv = hex_from_2char(tok, input->buf.data + j);
                 if (rv)
@@ -3586,55 +3582,55 @@ enum {
 
 static secuCommandFlag bltest_commands[] =
     {
-      { /* cmd_Decrypt  */ 'D', PR_FALSE, 0, PR_FALSE },
-      { /* cmd_Encrypt  */ 'E', PR_FALSE, 0, PR_FALSE },
+      { /* cmd_Decrypt */ 'D', PR_FALSE, 0, PR_FALSE },
+      { /* cmd_Encrypt */ 'E', PR_FALSE, 0, PR_FALSE },
       { /* cmd_FIPS */ 'F', PR_FALSE, 0, PR_FALSE },
       { /* cmd_Hash */ 'H', PR_FALSE, 0, PR_FALSE },
-      { /* cmd_Nonce      */ 'N', PR_FALSE, 0, PR_FALSE },
+      { /* cmd_Nonce */ 'N', PR_FALSE, 0, PR_FALSE },
       { /* cmd_Dump */ 'P', PR_FALSE, 0, PR_FALSE },
-      { /* cmd_RSAPopulate*/ 'R', PR_FALSE, 0, PR_FALSE },
+      { /* cmd_RSAPopulate */ 'R', PR_FALSE, 0, PR_FALSE },
       { /* cmd_Sign */ 'S', PR_FALSE, 0, PR_FALSE },
       { /* cmd_SelfTest */ 'T', PR_FALSE, 0, PR_FALSE },
-      { /* cmd_Verify   */ 'V', PR_FALSE, 0, PR_FALSE }
+      { /* cmd_Verify */ 'V', PR_FALSE, 0, PR_FALSE }
     };
 
 static secuCommandFlag bltest_options[] =
     {
-      { /* opt_B64    */ 'a', PR_FALSE, 0, PR_FALSE },
-      { /* opt_BufSize    */ 'b', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Restart    */ 'c', PR_FALSE, 0, PR_FALSE },
-      { /* opt_SelfTestDir  */ 'd', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Exponent   */ 'e', PR_TRUE, 0, PR_FALSE },
-      { /* opt_SigFile      */ 'f', PR_TRUE, 0, PR_FALSE },
-      { /* opt_KeySize    */ 'g', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Hex    */ 'h', PR_FALSE, 0, PR_FALSE },
-      { /* opt_Input      */ 'i', PR_TRUE, 0, PR_FALSE },
-      { /* opt_PQGFile    */ 'j', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Key    */ 'k', PR_TRUE, 0, PR_FALSE },
-      { /* opt_HexWSpc    */ 'l', PR_FALSE, 0, PR_FALSE },
-      { /* opt_Mode   */ 'm', PR_TRUE, 0, PR_FALSE },
+      { /* opt_B64 */ 'a', PR_FALSE, 0, PR_FALSE },
+      { /* opt_BufSize */ 'b', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Restart */ 'c', PR_FALSE, 0, PR_FALSE },
+      { /* opt_SelfTestDir */ 'd', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Exponent */ 'e', PR_TRUE, 0, PR_FALSE },
+      { /* opt_SigFile */ 'f', PR_TRUE, 0, PR_FALSE },
+      { /* opt_KeySize */ 'g', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Hex */ 'h', PR_FALSE, 0, PR_FALSE },
+      { /* opt_Input */ 'i', PR_TRUE, 0, PR_FALSE },
+      { /* opt_PQGFile */ 'j', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Key */ 'k', PR_TRUE, 0, PR_FALSE },
+      { /* opt_HexWSpc */ 'l', PR_FALSE, 0, PR_FALSE },
+      { /* opt_Mode */ 'm', PR_TRUE, 0, PR_FALSE },
 #ifndef NSS_DISABLE_ECC
-      { /* opt_CurveName      */ 'n', PR_TRUE, 0, PR_FALSE },
+      { /* opt_CurveName */ 'n', PR_TRUE, 0, PR_FALSE },
 #endif
-      { /* opt_Output     */ 'o', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Repetitions  */ 'p', PR_TRUE, 0, PR_FALSE },
-      { /* opt_ZeroBuf    */ 'q', PR_FALSE, 0, PR_FALSE },
-      { /* opt_Rounds     */ 'r', PR_TRUE, 0, PR_FALSE },
-      { /* opt_Seed   */ 's', PR_TRUE, 0, PR_FALSE },
-      { /* opt_SigSeedFile  */ 't', PR_TRUE, 0, PR_FALSE },
-      { /* opt_CXReps       */ 'u', PR_TRUE, 0, PR_FALSE },
-      { /* opt_IV         */ 'v', PR_TRUE, 0, PR_FALSE },
-      { /* opt_WordSize   */ 'w', PR_TRUE, 0, PR_FALSE },
-      { /* opt_UseSeed    */ 'x', PR_FALSE, 0, PR_FALSE },
-      { /* opt_UseSigSeed     */ 'y', PR_FALSE, 0, PR_FALSE },
-      { /* opt_SeedFile   */ 'z', PR_FALSE, 0, PR_FALSE },
-      { /* opt_AAD    */ 0, PR_TRUE, 0, PR_FALSE, "aad" },
-      { /* opt_InputOffset  */ '1', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Output */ 'o', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Repetitions */ 'p', PR_TRUE, 0, PR_FALSE },
+      { /* opt_ZeroBuf */ 'q', PR_FALSE, 0, PR_FALSE },
+      { /* opt_Rounds */ 'r', PR_TRUE, 0, PR_FALSE },
+      { /* opt_Seed */ 's', PR_TRUE, 0, PR_FALSE },
+      { /* opt_SigSeedFile */ 't', PR_TRUE, 0, PR_FALSE },
+      { /* opt_CXReps */ 'u', PR_TRUE, 0, PR_FALSE },
+      { /* opt_IV */ 'v', PR_TRUE, 0, PR_FALSE },
+      { /* opt_WordSize */ 'w', PR_TRUE, 0, PR_FALSE },
+      { /* opt_UseSeed */ 'x', PR_FALSE, 0, PR_FALSE },
+      { /* opt_UseSigSeed */ 'y', PR_FALSE, 0, PR_FALSE },
+      { /* opt_SeedFile */ 'z', PR_FALSE, 0, PR_FALSE },
+      { /* opt_AAD */ 0, PR_TRUE, 0, PR_FALSE, "aad" },
+      { /* opt_InputOffset */ '1', PR_TRUE, 0, PR_FALSE },
       { /* opt_OutputOffset */ '2', PR_TRUE, 0, PR_FALSE },
-      { /* opt_MonteCarlo   */ '3', PR_FALSE, 0, PR_FALSE },
-      { /* opt_ThreadNum    */ '4', PR_TRUE, 0, PR_FALSE },
+      { /* opt_MonteCarlo */ '3', PR_FALSE, 0, PR_FALSE },
+      { /* opt_ThreadNum */ '4', PR_TRUE, 0, PR_FALSE },
       { /* opt_SecondsToRun */ '5', PR_TRUE, 0, PR_FALSE },
-      { /* opt_CmdLine    */ '-', PR_FALSE, 0, PR_FALSE }
+      { /* opt_CmdLine */ '-', PR_FALSE, 0, PR_FALSE }
     };
 
 int
diff --git a/cmd/certcgi/certcgi.c b/cmd/certcgi/certcgi.c
index 3120de809..97945c4f4 100644
--- a/cmd/certcgi/certcgi.c
+++ b/cmd/certcgi/certcgi.c
@@ -2034,7 +2034,17 @@ main(int argc, char **argv)
     int which_key;
     char *pos;
 #ifdef OFFLINE
-    char *form_output = "key=MIIBPTCBpzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7SLqjWBL9Wl11Vlg%0AaMqZCvcQOL%2FnvSqYPPRP0XZy9SoAeyWzQnBOiCm2t8H5mK7r2jnKdAQOmfhjaJil%0A3hNVu3SekHOXF6Ze7bkWa6%2FSGVcY%2FojkydxFSgY43nd1iydzPQDp8WWLL%2BpVpt%2B%2B%0ATRhFtVXbF0fQI03j9h3BoTgP2lkCAwEAARYDZm9vMA0GCSqGSIb3DQEBBAUAA4GB%0AAJ8UfRKJ0GtG%2B%2BufCC6tAfTzKrq3CTBHnom55EyXcsAsv6WbDqI%2F0rLAPkn2Xo1r%0AnNhtMxIuj441blMt%2Fa3AGLOy5zmC7Qawt8IytvQikQ1XTpTBCXevytrmLjCmlURr%0ANJryTM48WaMQHiMiJpbXCqVJC1d%2FpEWBtqvALzZaOOIy&subject=CN%3D%22test%22%26serial-auto%3Dtrue%26serial_value%3D%26ver-1%3Dtrue%26ver-3%3Dfalse%26caChoiceradio-SignWithDefaultkey%3Dtrue%26caChoiceradio-SignWithRandomChain%3Dfalse%26autoCAs%3D%26caChoiceradio-SignWithSpecifiedChain%3Dfalse%26manCAs%3D%26%24";
+    char *form_output = "key=MIIBPTCBpzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7"
+        "SLqjWBL9Wl11Vlg%0AaMqZCvcQOL%2FnvSqYPPRP0XZy9SoAeyWzQnBOiCm2t8H5mK7r2"
+        "jnKdAQOmfhjaJil%0A3hNVu3SekHOXF6Ze7bkWa6%2FSGVcY%2FojkydxFSgY43nd1iyd"
+        "zPQDp8WWLL%2BpVpt%2B%2B%0ATRhFtVXbF0fQI03j9h3BoTgP2lkCAwEAARYDZm9vMA0"
+        "GCSqGSIb3DQEBBAUAA4GB%0AAJ8UfRKJ0GtG%2B%2BufCC6tAfTzKrq3CTBHnom55EyXc"
+        "sAsv6WbDqI%2F0rLAPkn2Xo1r%0AnNhtMxIuj441blMt%2Fa3AGLOy5zmC7Qawt8IytvQ"
+        "ikQ1XTpTBCXevytrmLjCmlURr%0ANJryTM48WaMQHiMiJpbXCqVJC1d%2FpEWBtqvALzZ"
+        "aOOIy&subject=CN%3D%22test%22%26serial-auto%3Dtrue%26serial_value%3D%"
+        "26ver-1%3Dtrue%26ver-3%3Dfalse%26caChoiceradio-SignWithDefaultkey%3Dt"
+        "rue%26caChoiceradio-SignWithRandomChain%3Dfalse%26autoCAs%3D%26caChoi"
+        "ceradio-SignWithSpecifiedChain%3Dfalse%26manCAs%3D%26%24";
 #else
     char *form_output;
 #endif