529365 - Fix build warnings: "warning: suggest explicit braces to avoid ambiguous 'else'"

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Daniel Holbert [:dholbert]]

mozilla-central currently hits these build warnings:

> ../../../../mozilla/intl/uconv/util/nsUCSupport.cpp:143: warning: suggest explicit braces to avoid ambiguous 'else'
> ../../../mozilla/layout/generic/nsImageMap.cpp:524: warning: suggest explicit braces to avoid ambiguous 'else'

(These are the only two instances of this particular warning, AFAIK.)

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: patch 1: fix for /layout/

Here's the fix for this in the intl directory.  This tweaks indentation (and fixes a number of whitespace-at-end-of-line issues, too), so I'll include a no-whitespace version as well. (coming up next)

Comment 2

[Daniel Holbert [:dholbert]]

Comment on attachment 412920 [details] [diff] [review]
patch 1: fix for /layout/

sorry, that one's the fix for layout. /intl/ one is coming up next. :)

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: patch 2: fix for /intl/

Comment 4

[Daniel Holbert [:dholbert]]

Attachment: patch 2, "diff -w" version

Comment 5

[Daniel Holbert [:dholbert]]

Comment on attachment 412920 [details] [diff] [review]
patch 1: fix for /layout/

Redirecting /layout/ review request to roc, since I think dbaron has a lengthy review queue already. :)

Comment 6

[Daniel Holbert [:dholbert]]

(note that the actual code-changes in the /layout/ patch are about halfway down, in PolyArea::IsInside.  Everything else is just excess-whitespace-cleanup in that file.)

Comment 7

[Daniel Holbert [:dholbert]]

(In reply to comment #6)
> (note that the actual code-changes in the /layout/ patch
(er, s/code changes/brace additions/... not sure I can really call those "code changes" :))

Comment 8

[Daniel Holbert [:dholbert]]

Pushed:
http://hg.mozilla.org/mozilla-central/rev/788d26b3f784
http://hg.mozilla.org/mozilla-central/rev/52d5ed462c9e