From ff73d1eb35d16a74418360603c84d67e48903c37 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 15 Dec 2005 10:43:36 +0000 Subject: [PATCH] Stefan Fiedler: checkisomd5: add explicit pointer casts to fix warnings like "pointer targets in passing argument 1 of 'strlen' differ in signedness" when compiling with gcc40 and which are treated as errors Index: misc/isomd5sum/libcheckisomd5.c =================================================================== [2005112019005925052] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6720 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/isomd5sum/libcheckisomd5.c | 12 ++++++------ misc/isomd5sum/libimplantisomd5.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/misc/isomd5sum/libcheckisomd5.c b/misc/isomd5sum/libcheckisomd5.c index 81c65b8a0..e884a3ab9 100644 --- a/misc/isomd5sum/libcheckisomd5.c +++ b/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); diff --git a/misc/isomd5sum/libimplantisomd5.c b/misc/isomd5sum/libimplantisomd5.c index f727f54f5..2519ab4bd 100644 --- a/misc/isomd5sum/libimplantisomd5.c +++ b/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) {