modffi: Don't use OSError for clearly unrelated errors.

pfalcon · pfalcon · commit b418b6fb0d74 · 2014-04-22T00:02:51.000+03:00
diff --git a/unix/modffi.c b/unix/modffi.c
@@ -99,7 +99,7 @@ STATIC ffi_type *get_ffi_type(mp_obj_t o_in)
     }
     // TODO: Support actual libffi type objects
 
-    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Unknown type"));
+    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "Unknown type"));
 }
 
 STATIC mp_obj_t return_ffi_value(ffi_arg val, char type)
@@ -163,7 +163,7 @@ STATIC mp_obj_t ffimod_func(uint n_args, const mp_obj_t *args) {
 
     int res = ffi_prep_cif(&o->cif, FFI_DEFAULT_ABI, nparams, char2ffi_type(*rettype), o->params);
     if (res != FFI_OK) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error in ffi_prep_cif"));
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Error in ffi_prep_cif"));
     }
 
     return o;
@@ -200,12 +200,12 @@ STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t
 
     int res = ffi_prep_cif(&o->cif, FFI_DEFAULT_ABI, nparams, char2ffi_type(*rettype), o->params);
     if (res != FFI_OK) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error in ffi_prep_cif"));
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Error in ffi_prep_cif"));
     }
 
     res = ffi_prep_closure_loc(o->clo, &o->cif, call_py_func, func_in, o->func);
     if (res != FFI_OK) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "ffi_prep_closure_loc"));
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "ffi_prep_closure_loc"));
     }
 
     return o;

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ STATIC ffi_type *get_ffi_type(mp_obj_t o_in)`
`99`	`99`	`}`
`100`	`100`	`// TODO: Support actual libffi type objects`
`101`	`101`
`102`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Unknown type"));`
	`102`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "Unknown type"));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`STATIC mp_obj_t return_ffi_value(ffi_arg val, char type)`
`@@ -163,7 +163,7 @@ STATIC mp_obj_t ffimod_func(uint n_args, const mp_obj_t *args) {`
`163`	`163`
`164`	`164`	`int res = ffi_prep_cif(&o->cif, FFI_DEFAULT_ABI, nparams, char2ffi_type(*rettype), o->params);`
`165`	`165`	`if (res != FFI_OK) {`
`166`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error in ffi_prep_cif"));`
	`166`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Error in ffi_prep_cif"));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`return o;`
`@@ -200,12 +200,12 @@ STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t`
`200`	`200`
`201`	`201`	`int res = ffi_prep_cif(&o->cif, FFI_DEFAULT_ABI, nparams, char2ffi_type(*rettype), o->params);`
`202`	`202`	`if (res != FFI_OK) {`
`203`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error in ffi_prep_cif"));`
	`203`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Error in ffi_prep_cif"));`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`res = ffi_prep_closure_loc(o->clo, &o->cif, call_py_func, func_in, o->func);`
`207`	`207`	`if (res != FFI_OK) {`
`208`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "ffi_prep_closure_loc"));`
	`208`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "ffi_prep_closure_loc"));`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`return o;`