1208355 - Fix -Wshadow warnings in dom/datastore

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Chris Peterson [:cpeterson]]

Attachment: Wshadow_datastore.patch

dom/datastore/DataStoreService.cpp:956:15 [-Wshadow-local] shadowed declaration is here
dom/datastore/DataStoreService.cpp:974:14 [-Wshadow-local] declaration of 'rv' shadows a previous local

Comment 1

[Andrea Marchesini [:baku]]

Comment on attachment 8665803 [details] [diff] [review]
Wshadow_datastore.patch

Review of attachment 8665803 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/datastore/DataStoreService.cpp
@@ +953,5 @@
>    }
>  
>    nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(window);
> +  ErrorResult createResult;
> +  nsRefPtr<Promise> promise = Promise::Create(global, createResult);

Instead doing this, can you use 'rv' also in the rest of the code?

Comment 2

[Chris Peterson [:cpeterson]]

(In reply to Andrea Marchesini (:baku) from comment #1)
> >    nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(window);
> > +  ErrorResult createResult;
> > +  nsRefPtr<Promise> promise = Promise::Create(global, createResult);
> 
> Instead doing this, can you use 'rv' also in the rest of the code?

I'm not sure I understand. Do you mean I should use a variable name like 'createRv' or simply 'rv'? I can't use the name 'ErrorResult rv' here because it will clash with the declaration 'nsresult rv' later in this function, which is the original -Wshadow warning I am trying to fix. :)

Comment 3

[Andrea Marchesini [:baku]]

Attachment: example.patch

I meant something like this.

Comment 4

[Chris Peterson [:cpeterson]]

Comment on attachment 8666666 [details] [diff] [review]
example.patch

Review of attachment 8666666 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks! I understand now. I didn't see the ErrorResult class had a conversion constructor for nsresult values.

Comment 5

[Chris Peterson [:cpeterson]]

Attachment: Wshadow_datastore_v2.patch

This patch includes the rv changes you asked for plus some other -Wshadow fixes in the DataStoreService::GetDataStoreInfos() member function.

Comment 6

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/9adede8793f2

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/9adede8793f2