From 716ae4e73c0f3bfaa2639e0b155f67724c75c422 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 14 Apr 2012 14:57:00 +0200 Subject: [PATCH] Bug 745287 - Fix recent a11y build warnings; r=davidb,capella --- accessible/src/generic/FormControlAccessible.cpp | 6 +++--- accessible/src/html/nsHTMLImageAccessible.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/accessible/src/generic/FormControlAccessible.cpp b/accessible/src/generic/FormControlAccessible.cpp index ce1ff2cc2f3..2915d964ee0 100644 --- a/accessible/src/generic/FormControlAccessible.cpp +++ b/accessible/src/generic/FormControlAccessible.cpp @@ -119,13 +119,13 @@ ProgressMeterAccessible::Value(nsString& aValue) double maxValue = 0; nsresult rv = GetMaximumValue(&maxValue); - NS_ENSURE_SUCCESS(rv, ); - if (maxValue == 0) + if (NS_FAILED(rv) || maxValue == 0) return; double curValue = 0; GetCurrentValue(&curValue); - NS_ENSURE_SUCCESS(rv, ); + if (NS_FAILED(rv)) + return; // Treat the current value bigger than maximum as 100%. double percentValue = (curValue < maxValue) ? diff --git a/accessible/src/html/nsHTMLImageAccessible.cpp b/accessible/src/html/nsHTMLImageAccessible.cpp index 4057fb2732f..3325c49f398 100644 --- a/accessible/src/html/nsHTMLImageAccessible.cpp +++ b/accessible/src/html/nsHTMLImageAccessible.cpp @@ -243,8 +243,7 @@ nsHTMLImageAccessible::GetLongDescURI() const nsDocAccessible* document = Document(); if (document) { IDRefsIterator iter(document, mContent, nsGkAtoms::aria_describedby); - nsIContent* target = nsnull; - while (target = iter.NextElem()) { + while (nsIContent* target = iter.NextElem()) { if ((target->IsHTML(nsGkAtoms::a) || target->IsHTML(nsGkAtoms::area)) && target->HasAttr(kNameSpaceID_None, nsGkAtoms::href)) { nsGenericHTMLElement* element =