diff options
Diffstat (limited to 'pdf/pdf_jsimp_cpp.c')
| -rw-r--r-- | pdf/pdf_jsimp_cpp.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/pdf/pdf_jsimp_cpp.c b/pdf/pdf_jsimp_cpp.c index 10fd835b..59cc4dd9 100644 --- a/pdf/pdf_jsimp_cpp.c +++ b/pdf/pdf_jsimp_cpp.c @@ -10,7 +10,7 @@ pdf_jsimp *pdf_new_jsimp(fz_context *ctx, void *jsctx) pdf_jsimp *jsi = NULL; const char *err = pdf_new_jsimp_cpp(ctx, jsctx, &jsi); if (err != NULL) - fz_throw(ctx, "%s", err); + fz_throw(ctx, FZ_ERROR_GENERIC, "%s", err); return jsi; } @@ -31,7 +31,7 @@ pdf_jsimp_type *pdf_jsimp_new_type(pdf_jsimp *imp, pdf_jsimp_dtr *dtr) pdf_jsimp_type *type = NULL; const char *err = pdf_jsimp_new_type_cpp(imp, dtr, &type); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return type; } @@ -47,21 +47,21 @@ void pdf_jsimp_addmethod(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf_j { const char *err = pdf_jsimp_addmethod_cpp(imp, type, name, meth); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); } void pdf_jsimp_addproperty(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf_jsimp_getter *get, pdf_jsimp_setter *set) { const char *err = pdf_jsimp_addproperty_cpp(imp, type, name, get, set); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); } void pdf_jsimp_set_global_type(pdf_jsimp *imp, pdf_jsimp_type *type) { const char *err = pdf_jsimp_set_global_type_cpp(imp, type); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); } pdf_jsimp_obj *pdf_jsimp_new_obj(pdf_jsimp *imp, pdf_jsimp_type *type, void *natobj) @@ -69,7 +69,7 @@ pdf_jsimp_obj *pdf_jsimp_new_obj(pdf_jsimp *imp, pdf_jsimp_type *type, void *nat pdf_jsimp_obj *obj = NULL; const char *err = pdf_jsimp_new_obj_cpp(imp, type, natobj, &obj); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return obj; } @@ -86,7 +86,7 @@ int pdf_jsimp_to_type(pdf_jsimp *imp, pdf_jsimp_obj *obj) int type = 0; const char *err = pdf_jsimp_to_type_cpp(imp, obj, &type); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return type; } @@ -96,7 +96,7 @@ pdf_jsimp_obj *pdf_jsimp_from_string(pdf_jsimp *imp, char *str) pdf_jsimp_obj *obj = NULL; const char *err = pdf_jsimp_from_string_cpp(imp, str, &obj); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return obj; } @@ -106,7 +106,7 @@ char *pdf_jsimp_to_string(pdf_jsimp *imp, pdf_jsimp_obj *obj) char *str = NULL; const char *err = pdf_jsimp_to_string_cpp(imp, obj, &str); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return str; } @@ -116,7 +116,7 @@ pdf_jsimp_obj *pdf_jsimp_from_number(pdf_jsimp *imp, double num) pdf_jsimp_obj *obj = NULL; const char *err = pdf_jsimp_from_number_cpp(imp, num, &obj); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return obj; } @@ -126,7 +126,7 @@ double pdf_jsimp_to_number(pdf_jsimp *imp, pdf_jsimp_obj *obj) double num; const char *err = pdf_jsimp_to_number_cpp(imp, obj, &num); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return num; } @@ -136,7 +136,7 @@ int pdf_jsimp_array_len(pdf_jsimp *imp, pdf_jsimp_obj *obj) int len = 0; const char *err = pdf_jsimp_array_len_cpp(imp, obj, &len); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return len; } @@ -146,7 +146,7 @@ pdf_jsimp_obj *pdf_jsimp_array_item(pdf_jsimp *imp, pdf_jsimp_obj *obj, int i) pdf_jsimp_obj *item = NULL; const char *err = pdf_jsimp_array_item_cpp(imp, obj, i, &item); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return item; } @@ -156,7 +156,7 @@ pdf_jsimp_obj *pdf_jsimp_property(pdf_jsimp *imp, pdf_jsimp_obj *obj, char *prop pdf_jsimp_obj *pobj = NULL; const char *err = pdf_jsimp_property_cpp(imp, obj, prop, &pobj); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); return pobj; } @@ -165,14 +165,14 @@ void pdf_jsimp_execute(pdf_jsimp *imp, char *code) { const char *err = pdf_jsimp_execute_cpp(imp, code); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); } void pdf_jsimp_execute_count(pdf_jsimp *imp, char *code, int count) { const char *err = pdf_jsimp_execute_count_cpp(imp, code, count); if (err != NULL) - fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err); + fz_throw(pdf_jsimp_ctx_cpp(imp), FZ_ERROR_GENERIC, "%s", err); } pdf_jsimp_obj *pdf_jsimp_call_method(pdf_jsimp *imp, pdf_jsimp_method *meth, void *jsctx, void *obj, int argc, pdf_jsimp_obj *args[]) { @@ -186,7 +186,7 @@ pdf_jsimp_obj *pdf_jsimp_call_method(pdf_jsimp *imp, pdf_jsimp_method *meth, voi fz_catch(ctx) { res = NULL; - fz_warn(ctx, "%s", ctx->error->message); + fz_warn(ctx, "%s", fz_caught_message(ctx)); } return res; @@ -204,7 +204,7 @@ pdf_jsimp_obj *pdf_jsimp_call_getter(pdf_jsimp *imp, pdf_jsimp_getter *get, void fz_catch(ctx) { res = NULL; - fz_warn(ctx, "%s", ctx->error->message); + fz_warn(ctx, "%s", fz_caught_message(ctx)); } return res; @@ -220,6 +220,6 @@ void pdf_jsimp_call_setter(pdf_jsimp *imp, pdf_jsimp_setter *set, void *jsctx, v } fz_catch(ctx) { - fz_warn(ctx, "%s", ctx->error->message); + fz_warn(ctx, "%s", fz_caught_message(ctx)); } } |