Code cleanup

This commit is contained in:
Pierre Pronchery 2011-04-24 03:39:11 +00:00
parent 2d9240b494
commit 4d8a6ee281

View File

@ -74,8 +74,6 @@ static int _deasm_string(char const * arch, char const * format,
static int _deasm_list(void); static int _deasm_list(void);
/* helper */ /* helper */
static int _deasm_helper_decode(Format * format, char const * section,
off_t offset, size_t size, off_t base);
static ssize_t _deasm_helper_read(Format * format, void * buf, size_t size); static ssize_t _deasm_helper_read(Format * format, void * buf, size_t size);
static off_t _deasm_helper_seek(Format * format, off_t offset, int whence); static off_t _deasm_helper_seek(Format * format, off_t offset, int whence);
@ -103,11 +101,10 @@ static int _deasm(char const * arch, char const * format,
Deasm deasm; Deasm deasm;
deasm.arch = arch; deasm.arch = arch;
memset(&deasm.helper, 0, sizeof(deasm.helper));
deasm.helper.format = &deasm; deasm.helper.format = &deasm;
deasm.helper.read = _deasm_helper_read; deasm.helper.read = _deasm_helper_read;
deasm.helper.seek = _deasm_helper_seek; deasm.helper.seek = _deasm_helper_seek;
deasm.helper.write = NULL;
deasm.helper.decode = _deasm_helper_decode;
deasm.format = NULL; deasm.format = NULL;
deasm.format_cnt = 0; deasm.format_cnt = 0;
if((deasm.fp = fopen(filename, "r")) == NULL) if((deasm.fp = fopen(filename, "r")) == NULL)
@ -334,24 +331,6 @@ static int _deasm_list(void)
/* helper */ /* helper */
/* deasm_helper_decode */
static int _deasm_helper_decode(Format * format, char const * section,
off_t offset, size_t size, off_t base)
{
if(section != NULL)
printf("\n%s%s:\n", "Disassembly of section ", section);
if(fseek(format->fp, offset, SEEK_SET) != 0)
return -error_set_code(1, "%s: %s", format->filename,
strerror(errno));
printf("\n%08lx:\n", (unsigned long)offset + base);
/* FIXME implement */
if(fseek(format->fp, offset + size, SEEK_SET) != 0)
return -error_set_code(1, "%s: %s", format->filename,
strerror(errno));
return 0;
}
/* deasm_helper_read */ /* deasm_helper_read */
static ssize_t _deasm_helper_read(Format * format, void * buf, size_t size) static ssize_t _deasm_helper_read(Format * format, void * buf, size_t size)
{ {