CVS commit: src/usr.bin/crunch/crunchide

[Luke Mewburn]

Module Name:    src
Committed By:   lukem
Date:           Sat Apr 11 12:53:52 UTC 2009

Modified Files:
        src/usr.bin/crunch/crunchide: exec_elf32.c

Log Message:
fix -Wsign-compare issues


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/crunch/crunchide/exec_elf32.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/crunch/crunchide/exec_elf32.c
diff -u src/usr.bin/crunch/crunchide/exec_elf32.c:1.13 src/usr.bin/crunch/crunchide/exec_elf32.c:1.14
--- src/usr.bin/crunch/crunchide/exec_elf32.c:1.13	Sat Jul 26 20:34:12 2003
+++ src/usr.bin/crunch/crunchide/exec_elf32.c	Sat Apr 11 12:53:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf32.c,v 1.13 2003/07/26 20:34:12 salo Exp $ */
+/* $NetBSD: exec_elf32.c,v 1.14 2009/04/11 12:53:52 lukem Exp $ */
 
 /*
  * Copyright (c) 1997, 1998 Christopher G. Demetriou
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: exec_elf32.c,v 1.13 2003/07/26 20:34:12 salo Exp $");
+__RCSID("$NetBSD: exec_elf32.c,v 1.14 2009/04/11 12:53:52 lukem Exp $");
 #endif
  
 #ifndef ELFSIZE
@@ -75,7 +75,7 @@
 		perror(fn);
 		return -1;
 	}
-	if ((rv = read(fd, buf, size)) != size) {
+	if ((size_t)(rv = read(fd, buf, size)) != size) {
 		fprintf(stderr, "%s: read error: %s\n", fn,
 		    rv == -1 ? strerror(errno) : "short read");
 		return -1;
@@ -92,7 +92,7 @@
 		perror(fn);
 		return -1;
 	}
-	if ((rv = write(fd, buf, size)) != size) {
+	if ((size_t)(rv = write(fd, buf, size)) != size) {
 		fprintf(stderr, "%s: write error: %s\n", fn,
 		    rv == -1 ? strerror(errno) : "short write");
 		return -1;
@@ -138,7 +138,7 @@
 	 */
 	if (fstat(fd, &sb) == -1)
 		return 0;
-	if (sb.st_size < sizeof eh)
+	if (sb.st_size < (off_t)(sizeof eh))
 		return 0;
 	if (read(fd, &eh, sizeof eh) != sizeof eh)
 		return 0;
@@ -180,7 +180,7 @@
 	int symtabsnum, strtabsnum;
 	Elf_Sym *symtabp = NULL;
 	char *strtabp = NULL, *nstrtabp = NULL;
-	Elf_Word nsyms;
+	Elf_Word j, nsyms;
 	Elf_Off stroff, maxoff;
 	const char *weirdreason;
 	ssize_t shdrsize;
@@ -245,7 +245,7 @@
 	if ((symtabp = xmalloc(shdrp[symtabsnum].sh_size, fn, "symbol table"))
 	    == NULL)
 		goto bad;
-	if (xreadatoff(fd, symtabp, shdrp[symtabsnum].sh_offset,
+	if ((size_t)xreadatoff(fd, symtabp, shdrp[symtabsnum].sh_offset,
 	    shdrp[symtabsnum].sh_size, fn) != shdrp[symtabsnum].sh_size)
 		goto bad;
 
@@ -253,7 +253,7 @@
 	if ((strtabp = xmalloc(shdrp[strtabsnum].sh_size, fn, "string table"))
 	    == NULL)
 		goto bad;
-	if (xreadatoff(fd, strtabp, shdrp[strtabsnum].sh_offset,
+	if ((size_t)xreadatoff(fd, strtabp, shdrp[strtabsnum].sh_offset,
 	    shdrp[strtabsnum].sh_size, fn) != shdrp[strtabsnum].sh_size)
 		goto bad;
 
@@ -267,8 +267,8 @@
 
 	fn_size = strlen(fn);
 
-	for (i = 0; i < nsyms; i++) {
-		Elf_Sym *sp = &symtabp[i];
+	for (j = 0; j < nsyms; j++) {
+		Elf_Sym *sp = &symtabp[j];
 		const char *symname = strtabp + sp->st_name;
 		size_t newent_len;
 
@@ -308,10 +308,10 @@
 	 */
 	if (xwriteatoff(fd, shdrp, ehdr.e_shoff, shdrsize, fn) != shdrsize)
 		goto bad;
-	if (xwriteatoff(fd, symtabp, shdrp[symtabsnum].sh_offset,
+	if ((size_t)xwriteatoff(fd, symtabp, shdrp[symtabsnum].sh_offset,
 	    shdrp[symtabsnum].sh_size, fn) != shdrp[symtabsnum].sh_size)
 		goto bad;
-	if (xwriteatoff(fd, nstrtabp, shdrp[strtabsnum].sh_offset,
+	if ((size_t)xwriteatoff(fd, nstrtabp, shdrp[strtabsnum].sh_offset,
 	    shdrp[strtabsnum].sh_size, fn) != shdrp[strtabsnum].sh_size)
 		goto bad;