diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-09-08 10:26:21 +1000 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-09-08 10:26:21 +1000 |
| commit | a78db3ef9f6e97353d636564f8bf2112ae1efbd3 (patch) | |
| tree | 967726e4a7fc8fe50d91a2abd8eb3a54d795dabc /cmd/signtool | |
| parent | 369c2546c705c0177ef62e165136aef3f703045e (diff) | |
| download | nss-hg-a78db3ef9f6e97353d636564f8bf2112ae1efbd3.tar.gz | |
Bug 1397990 - Run clang-format 4.0, r=me
These files were being reformatted by clang-format 4.0. If you make this
change, then both 3.9 (in CI) and 4.0 are happy with the result. I don't plan
to do this often, but it is a huge help.
Note that the PK11 ECDSA tests are an odd duck, I have more on that coming.
Diffstat (limited to 'cmd/signtool')
| -rw-r--r-- | cmd/signtool/javascript.c | 3 | ||||
| -rw-r--r-- | cmd/signtool/signtool.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/cmd/signtool/javascript.c b/cmd/signtool/javascript.c index 746f724f8..ffff2db59 100644 --- a/cmd/signtool/javascript.c +++ b/cmd/signtool/javascript.c @@ -1115,8 +1115,7 @@ extract_js(char *filename) textStart = 0; startLine = 0; - while (linenum = FB_GetLineNum(fb), (curchar = FB_GetChar(fb)) != - EOF) { + while (linenum = FB_GetLineNum(fb), (curchar = FB_GetChar(fb)) != EOF) { switch (state) { case TEXT_HTML_STATE: if (curchar == '<') { diff --git a/cmd/signtool/signtool.c b/cmd/signtool/signtool.c index 51857d638..915a00fbc 100644 --- a/cmd/signtool/signtool.c +++ b/cmd/signtool/signtool.c @@ -1033,9 +1033,7 @@ main(int argc, char *argv[]) if (errorCount > 0 || warningCount > 0) { PR_fprintf(outputFD, "%d error%s, %d warning%s.\n", errorCount, - errorCount == 1 ? "" : "s", warningCount, warningCount == 1 - ? "" - : "s"); + errorCount == 1 ? "" : "s", warningCount, warningCount == 1 ? "" : "s"); } else { PR_fprintf(outputFD, "Directory %s signed successfully.\n", jartree); |