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

No longer use PACKAGE for the program name as it does not match anymore

Browse Source
This commit is contained in:
Pierre Pronchery 2012-07-07 01:15:06 +00:00
parent 21aad23f5c
commit 2ca21f159d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@ -47,9 +47,9 @@ static int _asm(AsmPrefs * prefs, char const * arch, char const * format,
Asm * a; Asm * a;
if((a = asm_new(arch, format)) == NULL) if((a = asm_new(arch, format)) == NULL)
return error_print(PACKAGE); return error_print("asm");
if(asm_assemble(a, prefs, infile, outfile) != 0) if(asm_assemble(a, prefs, infile, outfile) != 0)
ret = error_print(PACKAGE); ret = error_print("asm");
asm_delete(a); asm_delete(a);
return ret; return ret;
} }
@ -63,9 +63,9 @@ static int _asm_string(AsmPrefs * prefs, char const * arch, char const * format,
Asm * a; Asm * a;
if((a = asm_new(arch, format)) == NULL) if((a = asm_new(arch, format)) == NULL)
return error_print(PACKAGE); return error_print("asm");
if(asm_assemble_string(a, prefs, outfile, string) != 0) if(asm_assemble_string(a, prefs, outfile, string) != 0)
ret = error_print(PACKAGE); ret = error_print("asm");
asm_delete(a); asm_delete(a);
return ret; return ret;
} }
@ -120,11 +120,11 @@ int main(int argc, char * argv[])
case 'l': case 'l':
o = 0; o = 0;
if(asm_plugin_list(APT_ARCH, 0) != 0) if(asm_plugin_list(APT_ARCH, 0) != 0)
o = error_print(PACKAGE); o = error_print("asm");
else else
putchar('\n'); putchar('\n');
if(asm_plugin_list(APT_FORMAT, 0) != 0) if(asm_plugin_list(APT_FORMAT, 0) != 0)
o = error_print(PACKAGE); o = error_print("asm");
return (o == 0) ? 0 : 2; return (o == 0) ? 0 : 2;
case 's': case 's':
string = optarg; string = optarg;
@ -163,7 +163,7 @@ static int _main_add_define(AsmPrefs * prefs, char * define)
value = strtok(define, "="); value = strtok(define, "=");
if((p = realloc(prefs->defines, sizeof(*p) * (prefs->defines_cnt + 1))) if((p = realloc(prefs->defines, sizeof(*p) * (prefs->defines_cnt + 1)))
== NULL) == NULL)
return -error_set_print(PACKAGE, 1, "%s", strerror(errno)); return -error_set_print("asm", 1, "%s", strerror(errno));
prefs->defines = p; prefs->defines = p;
prefs->defines[prefs->defines_cnt++] = define; prefs->defines[prefs->defines_cnt++] = define;
return 0; return 0;