diff options
| author | Chris Lumens <clumens@redhat.com> | 2010-08-30 13:18:35 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-10-15 16:42:25 -0400 |
| commit | c2090b051439176cf09fc0e43dbdabbaa205608a (patch) | |
| tree | 3a800f18b4187bc1d4cc317ede567ede90dd56bc /loader | |
| parent | 07085834ad7e845b09d5808c217caddd8a673e5f (diff) | |
| download | anaconda-c2090b051439176cf09fc0e43dbdabbaa205608a.tar.gz anaconda-c2090b051439176cf09fc0e43dbdabbaa205608a.tar.xz anaconda-c2090b051439176cf09fc0e43dbdabbaa205608a.zip | |
urlMainSetupPanel no longer takes an iurlinfo.
Instead, it operates on loaderData->instRepo directly.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/urlinstall.c | 2 | ||||
| -rw-r--r-- | loader/urls.c | 10 | ||||
| -rw-r--r-- | loader/urls.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/loader/urlinstall.c b/loader/urlinstall.c index 8e0439cb8..5e6e55924 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -265,7 +265,7 @@ char *mountUrlImage(struct installMethod *method, char *location, } else { char *substr; - if (urlMainSetupPanel(loaderData, &ui)) { + if (urlMainSetupPanel(loaderData)) { loaderData->stage2Data = NULL; return NULL; } diff --git a/loader/urls.c b/loader/urls.c index e9e244dde..be8f01e33 100644 --- a/loader/urls.c +++ b/loader/urls.c @@ -242,7 +242,7 @@ static void setProxySensitivity(newtComponent co, void *dptr) { return; } -int urlMainSetupPanel(struct loaderData_s *loaderData, struct iurlinfo * ui) { +int urlMainSetupPanel(struct loaderData_s *loaderData) { newtComponent form, okay, cancel, urlEntry, proxyCheckbox; newtComponent proxyEntries[3]; newtComponent answer, text; @@ -254,8 +254,8 @@ int urlMainSetupPanel(struct loaderData_s *loaderData, struct iurlinfo * ui) { char * buf = NULL; /* Populate the UI with whatever initial value we've got. */ - if (ui && ui->url) - url = ui->url; + if (loaderData->instRepo) + url = loaderData->instRepo; if (loaderData->proxy) proxy = loaderData->proxy; @@ -342,14 +342,14 @@ int urlMainSetupPanel(struct loaderData_s *loaderData, struct iurlinfo * ui) { continue; } + loaderData->instRepo = strdup(url); + if (strncmp(url, "http", 4) && strncmp(url, "ftp://", 6)) { newtWinMessage(_("Error"), _("OK"), _("URL must be either an ftp or http URL")); continue; } - ui->url = strdup(url); - if (enableProxy == '*') { if (strncmp(proxy, "http", 4) && strncmp(proxy, "ftp://", 6)) { newtWinMessage(_("Error"), _("OK"), diff --git a/loader/urls.h b/loader/urls.h index 09501ee8c..c00e2ee83 100644 --- a/loader/urls.h +++ b/loader/urls.h @@ -31,7 +31,7 @@ struct iurlinfo { void urlinfo_copy(struct iurlinfo *dst, const struct iurlinfo *src); int splitProxyParam(char *param, char **user, char **password, char **proxy); -int urlMainSetupPanel(struct loaderData_s *loaderData, struct iurlinfo * ui); +int urlMainSetupPanel(struct loaderData_s *loaderData); int urlinstTransfer(struct loaderData_s *loaderData, struct iurlinfo *ui, char **extraHeaders, char *dest); |