Skip to content
Snippets Groups Projects
Commit b401f277 authored by Juntong Liu's avatar Juntong Liu
Browse files

Merge branch 'E3-519_blockModuleLoadAfter_iocinit' into 'master'

E3-519: block module loading after iocinit

See merge request e3/e3-require!78
parents b5144d17 e76f803c
No related branches found
No related tags found
1 merge request!78E3-519: block module loading after iocinit
Pipeline #104048 passed
......@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### New Features
* Block module loading after iocInit has been invoked.
* Arguments have been added to `iocsh.bash` to enable user to pass any debugger options to GDB and Valgrind.
* Autocompletion for `iocsh.bash` has been added
* Removed `iocsh_gdb.bash` and `iocsh_nice.bash`, both of whose functionality can be called via `iocsh.bash -dg` and `iocsh.bash -n`, respectively.
......
......@@ -918,6 +918,11 @@ int require(const char *module, const char *version, const char *args) {
return -1;
}
if (interruptAccept) {
fprintf(stderr, "Error! Modules can only be loaded before iocIint!\n");
return -1;
}
/* either order for version and args, either may be empty or NULL */
if (version && strchr(version, '=')) {
const char *v = version;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment