diff --git a/anaconda/loader/mediacheck.c b/anaconda/loader/mediacheck.c index 3ee592c..6e96647 100644 --- a/anaconda/loader/mediacheck.c +++ b/anaconda/loader/mediacheck.c @@ -75,7 +75,7 @@ int doMediaCheck(char *file, char *descr) { data.scale = scale; data.label = label; - rc = mediaCheckFile(file, progressCallback, (void*)&data); + rc = mediaCheckFile(file, progressCallback, &data); newtFormDestroy(f); newtPopWindow(); diff --git a/anaconda/loader/windows.c b/anaconda/loader/windows.c index 1c7e144..3d57136 100644 --- a/anaconda/loader/windows.c +++ b/anaconda/loader/windows.c @@ -66,7 +66,7 @@ void scsiWindow(const char * driver) { _("Loading %s driver"), driver); } -int progressCallback(void *pbdata, long long pos, long long total) { +void progressCallback(void *pbdata, long long pos, long long total) { struct progressCBdata *data = pbdata; char tickmark[2] = "-"; char *ticks = "-\\|/"; @@ -77,7 +77,6 @@ int progressCallback(void *pbdata, long long pos, long long total) { newtLabelSetText(data->label, tickmark); newtRefresh(); - return 0; } struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...) { diff --git a/anaconda/loader/windows.h b/anaconda/loader/windows.h index a1646d4..f635102 100644 --- a/anaconda/loader/windows.h +++ b/anaconda/loader/windows.h @@ -37,7 +37,7 @@ struct progressCBdata { newtComponent label; }; -int progressCallback(void *pbdata, long long pos, long long total); +void progressCallback(void *pbdata, long long pos, long long total); struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...); #endif /* _WINDOWS_H_ */