727156 - fix warnings in toolkit/mozapps/update/

Status: RESOLVED FIXED

(Toolkit :: Application Update, defect)

Description

[Nathan Froyd [:froydnj]]

There's a couple different warnings here:

* set-but-unused variables
* unused functions (!)
* const char * -> char * warnings

Let's go ahead and fix them all in one go.

Comment 1

[Nathan Froyd [:froydnj]]

Attachment: patch

Comment 2

[Brian R. Bondy [:bbondy]]

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

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

Thanks for the patch.
But we need to tweak the ifdefs instead of removing those functions.

::: toolkit/mozapps/update/updater/updater.cpp
@@ -1461,5 @@
> - * @return true if the information was retrieved and it is pending
> - *         or pending-service.
> -*/
> -static bool
> -IsUpdateStatusPending(bool &isPendingService)

This is needed when #ifdef MOZ_MAINTENANCE_SERVICE (which happens currently on windows x86)

@@ -1495,5 @@
> - *         is set to succeeded or not.
> - * @return true if the information was retrieved and it is succeeded.
> -*/
> -static bool
> -IsUpdateStatusSucceeded(bool &isSucceeded)

This is needed on Windows so when #ifdef XP_WIN.

Comment 3

[Nathan Froyd [:froydnj]]

Attachment: patch

Thanks for the pointers.  That's the fun of fixing compiler warnings, isn't it?

Comment 4

[Brian R. Bondy [:bbondy]]

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

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

One last pass pls :D
Also pls run through try to make sure it builds fine on x64 and Windows x86.

::: toolkit/mozapps/update/updater/updater.cpp
@@ +1522,2 @@
>  
>  #ifdef XP_WIN

The previous #ifdef XP_WIN can be combined with this one.

Comment 5

[Nathan Froyd [:froydnj]]

Attachment: patch

Comment 6

[Mozilla RelEng Bot]

Autoland Patchset:
	Patches: 597113
	Branch: mozilla-central => try
	Destination: http://hg.mozilla.org/try/pushloghtml?changeset=b19c8e48aeaf
Try run started, revision b19c8e48aeaf. To cancel or monitor the job, see: https://tbpl.mozilla.org/?tree=Try&rev=b19c8e48aeaf

Comment 7

[Brian R. Bondy [:bbondy]]

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

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

Thanks for cleaning this up, you're good to go as long as it passes try.

Comment 8

[Mozilla RelEng Bot]

Try run for b19c8e48aeaf is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=b19c8e48aeaf
Results (out of 210 total builds):
    success: 177
    warnings: 19
    failure: 14
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-b19c8e48aeaf

Comment 9

[Dão Gottwald [:dao]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/a8634484e86b

Comment 10

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/a8634484e86b

Comment 11

[Brian R. Bondy [:bbondy]]

http://hg.mozilla.org/releases/mozilla-aurora/rev/18840d884c97