Commits

Anonymous committed 30332bf Draft

Bug 802458: Remove useless "NS_SUCCEEDED(rv)" in icon/gtk/nsIconChannel.cpp, and declare rv down where it's used. r=karlt

  • Participants
  • Parent commits 9fba505

Comments (0)

Files changed (1)

File image/decoders/icon/gtk/nsIconChannel.cpp

 nsresult
 nsIconChannel::InitWithGIO(nsIMozIconURI *aIconURI)
 {
-  nsresult rv;
-
   GIcon *icon = NULL;
   nsCOMPtr<nsIURL> fileURI;
 
   int32_t iconSize = GetIconSize(aIconURI);
 
   if (icon) {
-    NS_SUCCEEDED(rv);
-
     // Use icon and theme to get GtkIconInfo
     iconInfo = gtk_icon_theme_lookup_by_gicon(iconTheme,
                                               icon, iconSize,
     return NS_ERROR_UNEXPECTED;
   }
   
-  rv = ScaleIconBuf(&buf, iconSize);
+  nsresult rv = ScaleIconBuf(&buf, iconSize);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = moz_gdk_pixbuf_to_channel(buf, aIconURI,