diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-06 06:30:51 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-06 06:30:51 +0000 |
| commit | f46306945c95adc9a6232ce86f908f2a51a771dd (patch) | |
| tree | 7cfaba83c1935bc6624472e44d94f38ced09039c /mdk-stage1/directory.c | |
| parent | ab69c718222a8ad2f0fd91d26c6ca8dde5e5e797 (diff) | |
| download | drakx-f46306945c95adc9a6232ce86f908f2a51a771dd.tar drakx-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.gz drakx-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.bz2 drakx-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.xz drakx-f46306945c95adc9a6232ce86f908f2a51a771dd.zip | |
Stage 1 compilation fixes for gcc 4.0 :
* more casts signed<->unsigned types
* make choose_iso_in_directory()'s return type "void"
* change order of .h files in network.c so strndup is included correctly
* newt: initialize some variables properly
* compile pcmcia and ppp with -Wno-deprecated-declarations, since they use
deprecated types such as u_int32_t
Diffstat (limited to 'mdk-stage1/directory.c')
| -rw-r--r-- | mdk-stage1/directory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c index 3f0c4ed0a..6115b600c 100644 --- a/mdk-stage1/directory.c +++ b/mdk-stage1/directory.c @@ -45,7 +45,7 @@ char * extract_list_directory(char * direct) return strdup(tmp); } -static enum return_type choose_iso_in_directory(char *directory, char *location_full) +static void choose_iso_in_directory(char *directory, char *location_full) { char **file; char *stage2_isos[100] = { "Use directory as a mirror tree", "-----" }; @@ -90,7 +90,7 @@ static enum return_type choose_iso_in_directory(char *directory, char *location_ DISTRIB_NAME " Distribution.", stage2_isos, file); if (results == RETURN_BACK) { - return RETURN_BACK; + return; } else if (results == RETURN_OK) { if (!strcmp(*file, stage2_isos[0])) { /* use directory as a mirror tree */ |