1604071 - Dead assignment in nsPrintDialogServiceGTK::Show

Status: RESOLVED FIXED

(Core :: Printing: Setup, enhancement)

Description

[Alex Henrie]

nsPrintDialogServiceGTK::Show currently looks like this:

nsresult rv = fpPrintPortal->PreparePrintRequest(gtkParent);
NS_ENSURE_SUCCESS(rv, rv);

// This blocks until nsFlatpakPrintPortal::FinishPrintDialog is called
GtkPrintOperationResult printDialogResult = fpPrintPortal->GetResult();

rv = NS_OK;
switch (printDialogResult) {
  case GTK_PRINT_OPERATION_RESULT_APPLY: {
    nsCOMPtr<nsIObserverService> os =
        mozilla::services::GetObserverService();
    NS_ENSURE_STATE(os);
    // Observer waits until notified that the file with the content
    // to print has been written.
    rv = os->AddObserver(fpPrintPortal, "print-to-file-finished", false);
    NS_ENSURE_SUCCESS(rv, rv);
    break;
  }
  case GTK_PRINT_OPERATION_RESULT_CANCEL:
    rv = NS_ERROR_ABORT;
    break;
  default:
    NS_WARNING("Unexpected response");
    rv = NS_ERROR_ABORT;
}
return rv;

Setting rv to the constant NS_OK is pointless because rv was already set just before that and will be set again in the switch statement that immediately follows.

Comment 1

[Alex Henrie]

Attachment: Bug 1604071 - Remove dead assignment from nsPrintDialogServiceGTK::Show.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6946b0325267
Remove dead assignment from nsPrintDialogServiceGTK::Show. r=stransky

Comment 3

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/6946b0325267