* loader2/urlinstall.c: Do not pass silentErrors to

        urlinstStartTransfer() (#201247).

        * loader2/urls.c:  Remove redundant download failure messages in the
        urlinstStartTransfer() function.  Do not accept silentErrors as a
        parameter (#201247).

        * loader2/urls.h:  Prototype update for urlinstStartTransfer().

3 files changed, 9 insertions, 23 deletions

diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
index 661319467..573e74033 100644
--- a/loader2/urlinstall.c
+++ b/loader2/urlinstall.c
@@ -57,7 +57,7 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char * file,
         sprintf(ehdrs, "User-Agent: anaconda/%s\r\n", VERSION);
     }
 
-    fd = urlinstStartTransfer(ui, filepath, ehdrs, silentErrors);
+    fd = urlinstStartTransfer(ui, filepath, ehdrs);
 
     if (fd == -2) {
         if (ehdrs) free (ehdrs);
@@ -70,15 +70,15 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char * file,
         newFile = alloca(strlen(filepath) + 20);
         sprintf(newFile, "disc1/%s", filepath);
 
-        fd = urlinstStartTransfer(ui, newFile, ehdrs, silentErrors);
+        fd = urlinstStartTransfer(ui, newFile, ehdrs);
         if (ehdrs) free (ehdrs);
 
         if (fd == -2) return 2;
         if (fd < 0) {
-            if (!silentErrors) 
+            if (!silentErrors)
                 newtWinMessage(_("Error"), _("OK"),
                                _("Unable to retrieve %s://%s/%s/%s."),
-                               (ui->protocol == URL_METHOD_FTP ? "ftp" : 
+                               (ui->protocol == URL_METHOD_FTP ? "ftp" :
                                 "http"),
                                ui->address, ui->prefix, filepath);
             return 2;
@@ -422,7 +422,7 @@ int getFileFromUrl(char * url, char * dest,
         }
     }
 	
-    fd = urlinstStartTransfer(&ui, file, ehdrs, 0);
+    fd = urlinstStartTransfer(&ui, file, ehdrs);
     if (fd < 0) {
         logMessage(ERROR, "failed to retrieve http://%s/%s/%s", ui.address, ui.prefix, file);
         if (ehdrs) free(ehdrs);
diff --git a/loader2/urls.c b/loader2/urls.c
index 21be24063..0c83aeaf4 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -152,7 +152,7 @@ char *convertUIToURL(struct iurlinfo *ui) {
 /* see ftp.c:httpGetFileDesc() for details */
 /* set to NULL if not needed */
 int urlinstStartTransfer(struct iurlinfo * ui, char * filename, 
-                         char *extraHeaders, int silentErrors) {
+                         char *extraHeaders) {
     char * buf;
     int fd;
     int family = -1;
@@ -197,32 +197,18 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename,
                               ui->login ? ui->login : "anonymous", 
                               ui->password ? ui->password : "rhinstall@", 
                               NULL, -1);
-        if (ui->ftpPort < 0) {
-            if (!silentErrors)
-                newtWinMessage(_("Error"), _("OK"), 
-                               _("Failed to log into %s: %s"), ui->address, 
-                               ftpStrerror(ui->ftpPort, ui->protocol));
+        if (ui->ftpPort < 0)
             return -2;
-        }
 
         fd = ftpGetFileDesc(ui->ftpPort, addr6, family, buf);
         if (fd < 0) {
             close(ui->ftpPort);
-            if (!silentErrors)
-                newtWinMessage(_("Error"), _("OK"), 
-                               _("Failed to retrieve %s: %s"), buf,
-                               ftpStrerror(fd, ui->protocol));
             return -1;
         }
     } else {
         fd = httpGetFileDesc(ui->address, -1, buf, extraHeaders);
-        if (fd < 0) {
-            if (!silentErrors)
-                newtWinMessage(_("Error"), _("OK"), 
-                               _("Failed to retrieve %s: %s"), buf,
-                               ftpStrerror(fd, ui->protocol));
+        if (fd < 0)
             return -1;
-        }
     }
 
     if (!FL_CMDLINE(flags))
diff --git a/loader2/urls.h b/loader2/urls.h
index 7cfebfc5d..d6ead3069 100644
--- a/loader2/urls.h
+++ b/loader2/urls.h
@@ -23,7 +23,7 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
 		      char * doSecondarySetup);
 int urlSecondarySetupPanel(struct iurlinfo * ui, urlprotocol protocol);
 int urlinstStartTransfer(struct iurlinfo * ui, char * filename, 
-                         char *extraHeaders, int silentErrors);
+                         char *extraHeaders);
 int urlinstFinishTransfer(struct iurlinfo * ui, int fd);
 
 #endif