summaryrefslogtreecommitdiffstats
path: root/isomd5sum/libcheckisomd5.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /isomd5sum/libcheckisomd5.c
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-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 'isomd5sum/libcheckisomd5.c')
-rw-r--r--isomd5sum/libcheckisomd5.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/isomd5sum/libcheckisomd5.c b/isomd5sum/libcheckisomd5.c
index 847b41055..7f0cb140f 100644
--- a/isomd5sum/libcheckisomd5.c
+++ b/isomd5sum/libcheckisomd5.c
@@ -188,7 +188,7 @@ static int checkmd5sum(int isofd, char *mediasum, char *computedsum, int quiet)
}
if (!quiet) {
- printf("\b\b\b\b\b\b\n\n", (100.0*offset)/(isosize-skipsectors*2048.0));
+ printf("\b\b\b\b\b\b\n%05.1f\n", (100.0*offset)/(isosize-skipsectors*2048.0));
}
sleep(1);
@@ -232,7 +232,6 @@ static void readCB(void *co, long long pos) {
static int doMediaCheck(int isofd, char *mediasum, char *computedsum, long long *isosize, int *supported, int quiet) {
int rc;
- int llen;
int skipsectors;
if (parsepvd(isofd, mediasum, &skipsectors, isosize, supported) < 0) {
@@ -253,7 +252,6 @@ int mediaCheckFile(char *file, int quiet) {
int rc;
char *result;
unsigned char mediasum[33], computedsum[33];
- char tmpstr[256];
long long isosize;
int supported;
@@ -288,14 +286,11 @@ int mediaCheckFile(char *file, int quiet) {
return rc;
}
-int printMD5SUM(char *file) {
+void printMD5SUM(char *file) {
int isofd;
char mediasum[64];
- char computedsum;
long long isosize;
int supported;
- int rc;
- int llen;
int skipsectors;
isofd = open(file, O_RDONLY);