1555436 - Fix `readability-braces-around-statements` static analysis warnings for nsTextFrameUtils.* and nsTextRunTransformations.*

Status: RESOLVED FIXED

(Core :: Layout: Text and Fonts, defect, P3)

Description

[Daniel Holbert [:dholbert]]

Below are the warnings we get for this command:

./mach static-analysis check --checks "readability-braces-around-statements"  layout/generic/nsTextFrameUtils.* layout/generic/nsTextRunTransformations.*

 0:12.59  /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextFrameUtils.cpp
 0:12.59 Warning: readability-braces-around-statements in /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextFrameUtils.cpp: statement should be inside braces
 0:12.59 /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextFrameUtils.cpp:391:27: warning: statement should be inside braces [readability-braces-around-statements]
 0:12.59     if (!mRemainingLength) return false;
 0:12.59                           ^
 0:12.59                            {
 0:12.59 Warning: readability-braces-around-statements in /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextFrameUtils.h: statement should be inside braces
 0:12.59 /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextFrameUtils.h:136:76: warning: statement should be inside braces [readability-braces-around-statements]
 0:12.59     if (aArray->Length() > 0 && (*aArray)[aArray->Length() - 1] == aOffset)
 0:12.59                                                                            ^
 0:12.59                                                                             {
 0:12.59 Warning: readability-braces-around-statements in /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp: statement should be inside braces
 0:12.59 /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp:62:50: warning: statement should be inside braces [readability-braces-around-statements]
 0:12.59     if (!mCapitalize.AppendElements(GetLength())) return;
 0:12.59                                                  ^
 0:12.59                                                   {
 0:12.59 Warning: readability-braces-around-statements in /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp: statement should be inside braces
 0:12.59 /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp:135:23: warning: statement should be inside braces [readability-braces-around-statements]
 0:12.59     if (NS_FAILED(rv)) return;
 0:12.59                       ^
 0:12.59                        {
 0:12.59 Warning: readability-braces-around-statements in /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp: statement should be inside braces
 0:12.59 /scratch/work/builds/mozilla-central/mozilla/layout/generic/nsTextRunTransformations.cpp:828:14: warning: statement should be inside braces [readability-braces-around-statements]
 0:12.59   if (!child) return;
 0:12.59              ^
 0:12.59               {
 0:12.59 

Comment 1

[Daniel Holbert [:dholbert]]

You can use me as code-reviewer here if you like.

Commit message could be something like:
Bug 1555436: Add braces to address static analysis warnings in some text layout code. r?dholbert

Comment 2

[Charlie Marlow [:cmarlow]]

Attachment: Bug 1555436: Add braces to address static analysis warnings in some text layout code. r?dholbert

Comment 3

[Charlie Marlow [:cmarlow]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=2d8ac89954a0f9f6ad7f665fca59302b9ee1390f

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/619e50e40760
Add braces to address static analysis warnings in some text layout code. r=dholbert

Comment 5

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/619e50e40760