287097 - fix PreFast warnings in layout/tables.

Status: RESOLVED FIXED

(Core :: Layout: Tables, defect)

Description

[Bernd]

for PreFast see http://www.microsoft.com/whdc/devtools/tools/PREfast.mspx

e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp (1450): warning
246: Local declaration of 'borderPadding' hides declaration of the same name in
an outer scope:  see previous declaration at line 1385 of
e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp.
	FUNCTION: BasicTableLayoutStrategy::AssignPctColumnWidths (1361)
	PATH: 1385 

e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp (1514): warning
246: Local declaration of 'colX' hides declaration of the same name in an outer
scope:  see previous declaration at line 1374 of
e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp.
	FUNCTION: BasicTableLayoutStrategy::AssignPctColumnWidths (1361)
	PATH: 1374 

e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp (1540): warning
246: Local declaration of 'borderPadding' hides declaration of the same name in
an outer scope:  see previous declaration at line 1385 of
e:\moz_src\mozilla\layout\tables\basictablelayoutstrategy.cpp.
	FUNCTION: BasicTableLayoutStrategy::AssignPctColumnWidths (1361)
	PATH: 1385 

e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp (1500): warning 246:
Local declaration of 'availWidth' hides declaration of the same name in an outer
scope:  see previous declaration at line 1450 of
e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp.
	FUNCTION: nsTableOuterFrame::IR_TargetIsCaptionFrame (1436)
	PATH: 1450 

e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp (1693): warning 246:
Local declaration of 'availWidth' hides declaration of the same name in an outer
scope:  see previous declaration at line 1663 of
e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp.
	FUNCTION: nsTableOuterFrame::IR_InnerTableReflow (1632)
	PATH: 1663 

e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp (1798): warning 246:
Local declaration of 'availWidth' hides declaration of the same name in an outer
scope:  see previous declaration at line 1776 of
e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp.
	FUNCTION: nsTableOuterFrame::IR_CaptionInserted (1763)
	PATH: 1776 

e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp (1984): warning 246:
Local declaration of 'availWidth' hides declaration of the same name in an outer
scope:  see previous declaration at line 1968 of
e:\moz_src\mozilla\layout\tables\nstableouterframe.cpp.
	FUNCTION: nsTableOuterFrame::Reflow (1886)
	PATH: 1968

Comment 1

[Bernd]

Attachment: perl script to generate the warnings for a directory

Comment 2

[Bernd]

Attachment: patch

Comment 3

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 178142 [details] [diff] [review]
patch

>Index: nsTableOuterFrame.cpp
>@@ -1492,17 +1492,17 @@ 
>+    availWidth = GetInnerTableAvailWidth(aPresContext, mInnerTableFrame, aOuterRS, 
>                                                  &capMin, innerMargin, innerPadding);

Fix indent, and perhaps use a different variable name in this scope?

>@@ -1685,18 +1685,18 @@ 
>+      availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,

Again, I think better to use a different name in the nested scope.

>@@ -1790,17 +1790,17 @@ 
>+    availWidth = GetInnerTableAvailWidth(aPresContext, mInnerTableFrame, aOuterRS, 
>                                                  &capMin, innerMargin, innerPadding);

Same here (and fix indent).

r+sr=bzbarsky with those fixed.