Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 19 years ago
parent
commit
ff73d1eb35
2 changed files with 9 additions and 9 deletions
  1. +6
    -6
      misc/isomd5sum/libcheckisomd5.c
  2. +3
    -3
      misc/isomd5sum/libimplantisomd5.c

+ 6
- 6
misc/isomd5sum/libcheckisomd5.c

@ -57,7 +57,7 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
supportedfnd = 0;
loc = 0;
while (loc < 512) {
if (!strncmp(buf2 + loc, "ISO MD5SUM = ", 13)) {
if (!strncmp((char *)buf2 + loc, "ISO MD5SUM = ", 13)) {
/* make sure we dont walk off end */
if ((loc + 32) > 511)
@ -68,7 +68,7 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
md5fnd = 1;
loc += 45;
for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
} else if (!strncmp(buf2 + loc, "SKIPSECTORS = ", 14)) {
} else if (!strncmp((char *)buf2 + loc, "SKIPSECTORS = ", 14)) {
char *errptr;
/* make sure we dont walk off end */
@ -81,7 +81,7 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
*p = '\0';
*skipsectors = strtol(tmpbuf, &errptr, 10);
*skipsectors = strtol((char *)tmpbuf, &errptr, 10);
if (errptr && *errptr) {
return -1;
} else {
@ -89,10 +89,10 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
}
for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
} else if (!strncmp(buf2 + loc, "RHLISOSTATUS=1", 14)) {
} else if (!strncmp((char *)buf2 + loc, "RHLISOSTATUS=1", 14)) {
*supported = 1;
supportedfnd = 1;
} else if (!strncmp(buf2 + loc, "RHLISOSTATUS=0", 14)) {
} else if (!strncmp((char *)buf2 + loc, "RHLISOSTATUS=0", 14)) {
*supported = 0;
supportedfnd = 1;
} else {
@ -263,7 +263,7 @@ int mediaCheckFile(char *file, int quiet) {
return -1;
}
rc = doMediaCheck(isofd, mediasum, computedsum, &isosize, &supported, quiet);
rc = doMediaCheck(isofd, (char *)mediasum, (char *)computedsum, &isosize, &supported, quiet);
close(isofd);

+ 3
- 3
misc/isomd5sum/libimplantisomd5.c

@ -104,7 +104,7 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
return -1;
}
pvd_offset = parsepvd(isofd, mediasum, &isosize);
pvd_offset = parsepvd(isofd, (char *)mediasum, &isosize);
if (pvd_offset < 0) {
*errstr = "Could not find primary volumne!\n\n";
return -1;
@ -171,8 +171,8 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
loc = writeAppData(new_appdata, "ISO MD5SUM = ", loc);
loc = writeAppData(new_appdata, md5str, loc);
loc = writeAppData(new_appdata, ";", loc);
snprintf(buf, sizeof(buf), "SKIPSECTORS = %d", SKIPSECTORS);
loc = writeAppData(new_appdata, buf, loc);
snprintf((char *)buf, sizeof(buf), "SKIPSECTORS = %d", SKIPSECTORS);
loc = writeAppData(new_appdata, (char *)buf, loc);
loc = writeAppData(new_appdata, ";", loc);
if (supported) {

Loading…
Cancel
Save