Commit d300a25d authored by Randy Dunlap's avatar Randy Dunlap Committed by Sam Ravnborg

fix warnings in scripts/binoffset.c

Correct gcc warnings for function return type, printf argument
types, and signed/unsigned compare.

Cross-compiled with no warnings/errors for alpha, ia64,
ppc32, ppc64, sparc32, sparc64, x86_64, and native on i386.
(-W -Wall)

[pre-built tool chains are available from:
http://developer.osdl.org/dev/plm/cross_compile/ ]
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent a817884f
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
char *progname; char *progname;
char *inputname; char *inputname;
int inputfd; int inputfd;
int bix; /* buf index */ unsigned int bix; /* buf index */
unsigned char patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */ unsigned char patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */
int pat_len; /* actual number of pattern bytes */ int pat_len; /* actual number of pattern bytes */
unsigned char *madr; /* mmap address */ unsigned char *madr; /* mmap address */
...@@ -58,7 +58,7 @@ void usage (void) ...@@ -58,7 +58,7 @@ void usage (void)
exit (1); exit (1);
} }
int get_pattern (int pat_count, char *pats []) void get_pattern (int pat_count, char *pats [])
{ {
int ix, err, tmp; int ix, err, tmp;
...@@ -81,7 +81,7 @@ int get_pattern (int pat_count, char *pats []) ...@@ -81,7 +81,7 @@ int get_pattern (int pat_count, char *pats [])
pat_len = pat_count; pat_len = pat_count;
} }
int search_pattern (void) void search_pattern (void)
{ {
for (bix = 0; bix < filesize; bix++) { for (bix = 0; bix < filesize; bix++) {
if (madr[bix] == patterns[0]) { if (madr[bix] == patterns[0]) {
...@@ -109,7 +109,7 @@ size_t get_filesize (int fd) ...@@ -109,7 +109,7 @@ size_t get_filesize (int fd)
struct stat stat; struct stat stat;
err = fstat (fd, &stat); err = fstat (fd, &stat);
fprintf (stderr, "filesize: %d\n", err < 0 ? err : stat.st_size); fprintf (stderr, "filesize: %ld\n", err < 0 ? (long)err : stat.st_size);
if (err < 0) if (err < 0)
return err; return err;
return (size_t) stat.st_size; return (size_t) stat.st_size;
...@@ -154,8 +154,8 @@ int main (int argc, char *argv []) ...@@ -154,8 +154,8 @@ int main (int argc, char *argv [])
fprintf (stderr, "number of pattern matches = %d\n", num_matches); fprintf (stderr, "number of pattern matches = %d\n", num_matches);
if (num_matches == 0) if (num_matches == 0)
firstloc = ~0; firstloc = ~0;
printf ("%d\n", firstloc); printf ("%ld\n", firstloc);
fprintf (stderr, "%d\n", firstloc); fprintf (stderr, "%ld\n", firstloc);
exit (num_matches ? 0 : 2); exit (num_matches ? 0 : 2);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment