DeforaOS/Asm
DeforaOS/Asm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2011-09-28 00:38:56 +00:00
parent b765b4c05e
commit ff9acd73d1
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/format/java.c
View File

@ -107,8 +107,6 @@ static int _java_exit(FormatPlugin * format);
static char const * _java_detect(FormatPlugin * format); static char const * _java_detect(FormatPlugin * format);
static int _java_decode(FormatPlugin * format, int raw); static int _java_decode(FormatPlugin * format, int raw);
static int _java_error(FormatPlugin * format);
/* public */ /* public */
/* variables */ /* variables */
@ -138,12 +136,7 @@ static int _java_init(FormatPlugin * format, char const * arch)
JavaHeader jh; JavaHeader jh;
JavaPlugin * java; JavaPlugin * java;
if(arch == NULL) if(arch != NULL && strcmp(arch, "java") != 0)
{
format->priv = NULL;
return 0;
}
if(strcmp(arch, "java") != 0)
return error_set_code(1, "%s: %s", arch, return error_set_code(1, "%s: %s", arch,
"Unsupported architecture for java"); "Unsupported architecture for java");
memcpy(&jh.magic, format->signature, format->signature_len); memcpy(&jh.magic, format->signature, format->signature_len);
@ -152,8 +145,8 @@ static int _java_init(FormatPlugin * format, char const * arch)
jh.cp_cnt = _htob16(0); jh.cp_cnt = _htob16(0);
if(helper->write(helper->format, &jh, sizeof(jh)) != sizeof(jh)) if(helper->write(helper->format, &jh, sizeof(jh)) != sizeof(jh))
return -1; return -1;
if((java = malloc(sizeof(*java))) == NULL) if((java = object_new(sizeof(*java))) == NULL)
return -_java_error(format); return -1;
memset(java, 0, sizeof(*java)); memset(java, 0, sizeof(*java));
format->priv = java; format->priv = java;
return 0; return 0;
@ -455,11 +448,3 @@ static int _decode_skip_interfaces(FormatPlugin * format, uint16_t cnt)
return -1; return -1;
return 0; return 0;
} }
/* java_error */
static int _java_error(FormatPlugin * format)
{
return -error_set_code(1, "%s: %s", format->helper->get_filename(
format->helper->format), strerror(errno));
}