coolfactor/lightscript
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some friendlier error messages in cases where assert isn't really appropriate

Browse Source
This commit is contained in:
Gavan Fantom
2007-12-27 17:26:51 +00:00
parent e5aca158e2
commit a4031c5ff8
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/lsi/vm.c
View File

@@ -861,7 +861,9 @@ void vm_load_file(char *filename)
char *ptr; char *ptr;
fh = fopen(filename, "r"); fh = fopen(filename, "r");
assert(fh != NULL); if (fh == NULL) {
err(1, "Failed to open '%s'", filename);
}
for (ptr = vm_codearea; ptr < vm_codearea+vm_codesize; ptr++) { for (ptr = vm_codearea; ptr < vm_codearea+vm_codesize; ptr++) {
int c; int c;
@@ -887,16 +889,19 @@ void vm_init_functions(void)
struct hashentry *ptr; struct hashentry *ptr;
/* First, let's check the magic */ /* First, let's check the magic */
assert(vm_codearea[0] == MAGIC1); if ((vm_codearea[0] != MAGIC1) ||
assert(vm_codearea[1] == MAGIC2); (vm_codearea[1] != MAGIC2))
assert(vm_codearea[2] == VERSION1); errx(1, "Bad magic - not a lightscript binary");
assert(vm_codearea[3] == VERSION2); if ((vm_codearea[2] != VERSION1) ||
(vm_codearea[3] != VERSION2))
errx(1, "Bad version - recompile");
assert(GETINT(vm_codearea, 8) == vm_abiversion1); if ((GETINT(vm_codearea, 8) != vm_abiversion1) ||
assert(GETINT(vm_codearea, 12) == vm_abiversion2); (GETINT(vm_codearea, 12) == vm_abiversion2) ||
assert(GETINT(vm_codearea, 16) == vm_abiversion3); (GETINT(vm_codearea, 16) == vm_abiversion3) ||
assert(GETINT(vm_codearea, 20) == vm_abiversion4); (GETINT(vm_codearea, 20) == vm_abiversion4) ||
assert(GETINT(vm_codearea, 24) == vm_abiversion5); (GETINT(vm_codearea, 24) == vm_abiversion5))
errx(1, "Incompatible ABI version - recompile");
/* Now, get the function table pointer */ /* Now, get the function table pointer */
t = GETINT(vm_codearea, 4); t = GETINT(vm_codearea, 4);