diff options
| author | Philipp Stephani <phst@google.com> | 2017-06-04 19:02:50 +0200 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2017-06-04 19:50:50 +0200 |
| commit | 045d21c20a60e2c336568516d620d6f98ca3642d (patch) | |
| tree | dd129cf5eb43d7b776adcee17eaa62cd205def79 /src/emacs-module.c | |
| parent | 3b0080de52db1756fc47f1642ee9980655421af9 (diff) | |
| download | emacs-045d21c20a60e2c336568516d620d6f98ca3642d.tar.gz emacs-045d21c20a60e2c336568516d620d6f98ca3642d.tar.bz2 emacs-045d21c20a60e2c336568516d620d6f98ca3642d.zip | |
Rationalize environment lifetime management functions
* src/emacs-module.c (Fmodule_load, funcall_module): Adapt callers.
(finalize_environment): Add parameter for public part of the
environment, like 'initialize_environment'. Add assertions.
Diffstat (limited to 'src/emacs-module.c')
| -rw-r--r-- | src/emacs-module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c index f9e76b5f0f8..0fb126e61f5 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -100,8 +100,8 @@ static Lisp_Object value_to_lisp (emacs_value); static emacs_value lisp_to_value (Lisp_Object); static enum emacs_funcall_exit module_non_local_exit_check (emacs_env *); static void check_main_thread (void); -static void finalize_environment (struct emacs_env_private *); -static void initialize_environment (emacs_env *, struct emacs_env_private *priv); +static void initialize_environment (emacs_env *, struct emacs_env_private *); +static void finalize_environment (emacs_env *, struct emacs_env_private *); static void module_handle_signal (emacs_env *, Lisp_Object); static void module_handle_throw (emacs_env *, Lisp_Object); static void module_non_local_exit_signal_1 (emacs_env *, Lisp_Object, Lisp_Object); @@ -632,7 +632,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0, .get_environment = module_get_environment }; int r = module_init (&pub); - finalize_environment (&priv); + finalize_environment (&rt.pub, &priv); if (r != 0) { @@ -676,20 +676,20 @@ funcall_module (Lisp_Object function, ptrdiff_t nargs, Lisp_Object *arglist) switch (priv.pending_non_local_exit) { case emacs_funcall_exit_return: - finalize_environment (&priv); + finalize_environment (&pub, &priv); return value_to_lisp (ret); case emacs_funcall_exit_signal: { Lisp_Object symbol = priv.non_local_exit_symbol; Lisp_Object data = priv.non_local_exit_data; - finalize_environment (&priv); + finalize_environment (&pub, &priv); xsignal (symbol, data); } case emacs_funcall_exit_throw: { Lisp_Object tag = priv.non_local_exit_symbol; Lisp_Object value = priv.non_local_exit_data; - finalize_environment (&priv); + finalize_environment (&pub, &priv); Fthrow (tag, value); } default: @@ -904,7 +904,7 @@ initialize_environment (emacs_env *env, struct emacs_env_private *priv) /* Must be called before the lifetime of the environment object ends. */ static void -finalize_environment (struct emacs_env_private *env) +finalize_environment (emacs_env *env, struct emacs_env_private *priv) { Vmodule_environments = XCDR (Vmodule_environments); } |