FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Gentoo > Gentoo User

 
 
LinkBack Thread Tools
 
Old 10-13-2010, 03:11 PM
Chris Lumens
 
Default urlMainSetupPanel no longer takes an iurlinfo.

Instead, it operates on loaderData->instRepo directly.
---
loader/urlinstall.c | 2 +-
loader/urls.c | 10 +++++-----
loader/urls.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 8e0439c..5e6e559 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 e9e244d..be8f01e 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 09501ee..c00e2ee 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);

--
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 10-14-2010, 03:12 PM
Ales Kozumplik
 
Default urlMainSetupPanel no longer takes an iurlinfo.

On 10/13/2010 05:11 PM, Chris Lumens wrote:

Instead, it operates on loaderData->instRepo directly.
---
loader/urlinstall.c | 2 +-
loader/urls.c | 10 +++++-----
loader/urls.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)


Ack.

Ales

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 02:43 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org