From 66b072d5aeea380350b993f14edbf5af14a00dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martijn=20Th=C3=A9?= Date: Tue, 1 Aug 2017 15:39:21 +0200 Subject: [PATCH] Fix: make jerryx_module_resolve resolvers argument const (#1942) The resolvers argument that is passed to jerryx_module_resolve() is not mutated by the function. Therefore the argument should be const. In the docs, a static const array is passed, but this currently does not work w/o a cast. This patch fixes this. JerryScript-DCO-1.0-Signed-off-by: Martijn The martijn.the@intel.com --- docs/12.EXT-REFERENCE-MODULE.md | 4 ++-- jerry-ext/include/jerryscript-ext/module.h | 2 +- jerry-ext/module/module.c | 2 +- tests/unit-ext/module/jerry-module-test.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/12.EXT-REFERENCE-MODULE.md b/docs/12.EXT-REFERENCE-MODULE.md index f28679f64..5bc7e678b 100644 --- a/docs/12.EXT-REFERENCE-MODULE.md +++ b/docs/12.EXT-REFERENCE-MODULE.md @@ -38,7 +38,7 @@ called. ```c jerry_value_t jerryx_module_resolve (const jerry_char_t *name, - jerryx_module_resolver_t *resolvers_p, + const jerryx_module_resolver_t *resolvers_p, size_t resolver_count); ``` @@ -134,7 +134,7 @@ load_and_evaluate_js_file (const jerry_char_t *name, jerry_value_t *result) We can now load JavaScript files: ```c -static const jerryx_module_resolver_t resolvers = +static const jerryx_module_resolver_t resolvers[] = { /* Consult the JerryScript module resolver first, in case the requested module is a compiled-in JerryScript module. */ jerryx_module_native_resolver, diff --git a/jerry-ext/include/jerryscript-ext/module.h b/jerry-ext/include/jerryscript-ext/module.h index 00f22b656..b123489f7 100644 --- a/jerry-ext/include/jerryscript-ext/module.h +++ b/jerry-ext/include/jerryscript-ext/module.h @@ -69,6 +69,6 @@ typedef bool (*jerryx_module_resolver_t) (const jerry_char_t *name, jerry_value_ * Load a copy of a module into the current context using the provided module resolvers, or return one that was already * loaded if it is found. */ -jerry_value_t jerryx_module_resolve (const jerry_char_t *name, jerryx_module_resolver_t *resolvers, size_t count); +jerry_value_t jerryx_module_resolve (const jerry_char_t *name, const jerryx_module_resolver_t *resolvers, size_t count); #endif /* !JERRYX_MODULE_H */ diff --git a/jerry-ext/module/module.c b/jerry-ext/module/module.c index 917cf5dd1..6cf8873ce 100644 --- a/jerry-ext/module/module.c +++ b/jerry-ext/module/module.c @@ -181,7 +181,7 @@ jerryx_module_native_resolver (const jerry_char_t *name, /**< name of the module */ jerry_value_t jerryx_module_resolve (const jerry_char_t *name, /**< name of the module to load */ - jerryx_module_resolver_t *resolvers_p, /**< list of resolvers */ + const jerryx_module_resolver_t *resolvers_p, /**< list of resolvers */ size_t resolver_count) /**< number of resolvers in @p resolvers */ { size_t index; diff --git a/tests/unit-ext/module/jerry-module-test.c b/tests/unit-ext/module/jerry-module-test.c index 7fe3c22c5..e08a5ce81 100644 --- a/tests/unit-ext/module/jerry-module-test.c +++ b/tests/unit-ext/module/jerry-module-test.c @@ -91,7 +91,7 @@ cache_check (const jerry_char_t *name, return false; } /* cache_check */ -static jerryx_module_resolver_t resolvers[3] = +static const jerryx_module_resolver_t resolvers[3] = { jerryx_module_native_resolver, resolve_differently_handled_module,