d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few WARNS:

Browse Source 
1) Include string.h for strcpy.
2) Don't make duplicate declaration of dump_file, we now include extern.h.
3) Help out with some constness.
4) Cast to slightly better types in some comparisons.
This commit is contained in:
dwmalone 2004-02-15 22:01:23 +00:00
parent e6420ce89a
commit 0bde518078
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/ldd/sods.c
View File

@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include <stab.h> #include <stab.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "extern.h" #include "extern.h"
@ -72,7 +73,6 @@ __FBSDID("$FreeBSD$");
#ifdef STANDALONE #ifdef STANDALONE
static static
#endif #endif
void dump_file(const char *);
static void dump_rels(const char *, const struct relocation_info *, static void dump_rels(const char *, const struct relocation_info *,
unsigned long, const char *(*)(unsigned long), unsigned char *); unsigned long, const char *(*)(unsigned long), unsigned char *);
@ -182,7 +182,7 @@ dump_file(const char *fname)
file_base = (const char *) objbase; /* Makes address arithmetic easier */ file_base = (const char *) objbase; /* Makes address arithmetic easier */
if (IS_ELF(*(Elf32_Ehdr*) file_base)) { if (IS_ELF(*(const Elf32_Ehdr*) file_base)) {
warnx("%s: this is an ELF program; use objdump to examine", fname); warnx("%s: this is an ELF program; use objdump to examine", fname);
++error_count; ++error_count;
munmap(objbase, sb.st_size); munmap(objbase, sb.st_size);
@ -286,13 +286,13 @@ dump_file(const char *fname)
(const struct relocation_info *) (text_addr + sdt->sdt_rel); (const struct relocation_info *) (text_addr + sdt->sdt_rel);
rtrel_count = (sdt->sdt_hash - sdt->sdt_rel) / sizeof rtrel_base[0]; rtrel_count = (sdt->sdt_hash - sdt->sdt_rel) / sizeof rtrel_base[0];
assert(rtrel_count * sizeof rtrel_base[0] == assert(rtrel_count * sizeof rtrel_base[0] ==
sdt->sdt_hash - sdt->sdt_rel); (size_t)(sdt->sdt_hash - sdt->sdt_rel));
rtsym_base = (const struct nzlist *) (text_addr + sdt->sdt_nzlist); rtsym_base = (const struct nzlist *) (text_addr + sdt->sdt_nzlist);
rtsym_count = (sdt->sdt_strings - sdt->sdt_nzlist) / rtsym_count = (sdt->sdt_strings - sdt->sdt_nzlist) /
sizeof rtsym_base[0]; sizeof rtsym_base[0];
assert(rtsym_count * sizeof rtsym_base[0] == assert(rtsym_count * sizeof rtsym_base[0] ==
sdt->sdt_strings - sdt->sdt_nzlist); (size_t)(sdt->sdt_strings - sdt->sdt_nzlist));
if (rtsym_count != 0) { if (rtsym_count != 0) {
rtsym_used = (unsigned char *) calloc(rtsym_count, rtsym_used = (unsigned char *) calloc(rtsym_count,
@ -338,8 +338,8 @@ dump_rels(const char *label, const struct relocation_info *base,
size = 1u << r->r_length; size = 1u << r->r_length;
if (origin <= r->r_address if (origin <= (unsigned long)r->r_address
&& r->r_address < origin + ex->a_text + ex->a_data && (unsigned long)r->r_address < origin + ex->a_text + ex->a_data
&& 1 <= size && size <= 4) { && 1 <= size && size <= 4) {
/* /*
* XXX - This can cause unaligned accesses. OK for the * XXX - This can cause unaligned accesses. OK for the