diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
| commit | 459119c94529602d08de465b7ebfa4871d328081 (patch) | |
| tree | 369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /loader2/urls.c | |
| parent | 390977d3ee0ebc010168ce04573f63ae15458718 (diff) | |
| download | anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz anaconda-459119c94529602d08de465b7ebfa4871d328081.zip | |
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is
* clean up warnings, we build with -Wall -Werror here too
* product.img stuff
* max logical partitions enforcement
* 1 TB max fs size
* ethtool stuff
* autopart in kickstart
* driver disk fixes
* RHEL upgrade stuff
* network driver disks
* variant pkgorder/tree splitting
Diffstat (limited to 'loader2/urls.c')
| -rw-r--r-- | loader2/urls.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/loader2/urls.c b/loader2/urls.c index 23bce718f..03acda76e 100644 --- a/loader2/urls.c +++ b/loader2/urls.c @@ -143,8 +143,8 @@ char *convertUIToURL(struct iurlinfo *ui) { /* extraHeaders only applicable for http and used for pulling ks from http */ /* see ftp.c:httpGetFileDesc() for details */ /* set to NULL if not needed */ -int urlinstStartTransfer(struct iurlinfo * ui, char * filename, char *extraHeaders, - int silentErrors) { +int urlinstStartTransfer(struct iurlinfo * ui, char * filename, + char *extraHeaders, int silentErrors) { char * buf; int fd; char * finalPrefix; @@ -265,8 +265,10 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol, newtTextboxSetText(text, reflowedText); free(reflowedText); - siteEntry = newtEntry(22, 8, site, 24, &site, NEWT_ENTRY_SCROLL); - dirEntry = newtEntry(22, 9, dir, 24, &dir, NEWT_ENTRY_SCROLL); + siteEntry = newtEntry(22, 8, site, 24, (const char **) &site, + NEWT_ENTRY_SCROLL); + dirEntry = newtEntry(22, 9, dir, 24, (const char **) &dir, + NEWT_ENTRY_SCROLL); entryGrid = newtCreateGrid(2, 2); newtGridSetField(entryGrid, 0, 0, NEWT_GRID_COMPONENT, @@ -407,14 +409,15 @@ int urlSecondarySetupPanel(struct iurlinfo * ui, urlprotocol protocol) { free(reflowedText); if (protocol == URL_METHOD_FTP) { - accountEntry = newtEntry(-1, -1, NULL, 24, &account, + accountEntry = newtEntry(-1, -1, NULL, 24, (const char **) &account, NEWT_FLAG_SCROLL); - passwordEntry = newtEntry(-1, -1, NULL, 24, &password, + passwordEntry = newtEntry(-1, -1, NULL, 24, (const char **) &password, NEWT_FLAG_SCROLL | NEWT_FLAG_PASSWORD); } - proxyEntry = newtEntry(-1, -1, ui->proxy, 24, &proxy, NEWT_ENTRY_SCROLL); - proxyPortEntry = newtEntry(-1, -1, ui->proxyPort, 6, &proxyPort, - NEWT_FLAG_SCROLL); + proxyEntry = newtEntry(-1, -1, ui->proxy, 24, (const char **) &proxy, + NEWT_ENTRY_SCROLL); + proxyPortEntry = newtEntry(-1, -1, ui->proxyPort, 6, + (const char **) &proxyPort, NEWT_FLAG_SCROLL); entryGrid = newtCreateGrid(2, 4); if (protocol == URL_METHOD_FTP) { |