diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
| commit | 459119c94529602d08de465b7ebfa4871d328081 (patch) | |
| tree | 369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /isomd5sum/libimplantisomd5.c | |
| parent | 390977d3ee0ebc010168ce04573f63ae15458718 (diff) | |
| download | anaconda-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/libimplantisomd5.c')
| -rw-r--r-- | isomd5sum/libimplantisomd5.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/isomd5sum/libimplantisomd5.c b/isomd5sum/libimplantisomd5.c index 4d7d4c5d0..f727f54f5 100644 --- a/isomd5sum/libimplantisomd5.c +++ b/isomd5sum/libimplantisomd5.c @@ -7,6 +7,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <string.h> +#include <unistd.h> #include "md5.h" #include "libimplantisomd5.h" @@ -25,7 +26,7 @@ static int parsepvd(int isofd, char *mediasum, long long *isosize) { unsigned char buf[2048]; long long offset; - unsigned char *p; + unsigned char *p __attribute__((unused)); if (lseek(isofd, 16*2048, SEEK_SET) == -1) return ((long long)-1); @@ -78,15 +79,10 @@ static unsigned int writeAppData(unsigned char *appdata, char *valstr, unsigned } -static void usage(void) { - fprintf(stderr, "implantisomd5: implantisomd5 [--force] [--supported] <isofilename>\n"); - exit(1); -} int implantISOFile(char *fname, int supported, int forceit, int quiet, char **errstr) { int i; - int rc; int isofd; int nread; int dirty; @@ -97,7 +93,7 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er unsigned char buf[2048]; unsigned char orig_appdata[512]; unsigned char new_appdata[512]; - unsigned char mediasum[33], computedsum[33]; + unsigned char mediasum[33]; char md5str[40]; MD5_CTX md5ctx; |