Commit 62d787ed authored by Paul Eggert's avatar Paul Eggert
Browse files

Fix minor module problems found by static checking

* src/dynlib.c (dynlib_close): #ifdef out for now, as it’s not used.
* src/eval.c, src/lisp.h (lisp_eval_depth): Now static.
* src/module.c (Fmodule_load): Fix pointer signedness bug.
(Fmodule_call): Tell GCC that the default case is unreachable.
parent c8a972b0
...@@ -103,11 +103,15 @@ dynlib_error (void) ...@@ -103,11 +103,15 @@ dynlib_error (void)
return dlerror (); return dlerror ();
} }
/* FIXME: Currently there is no way to unload a module, so this
function is never used. */
#if false
int int
dynlib_close (dynlib_handle_ptr h) dynlib_close (dynlib_handle_ptr h)
{ {
return dlclose (h) == 0; return dlclose (h) == 0;
} }
#endif
#else #else
......
...@@ -61,7 +61,7 @@ union specbinding *specpdl_ptr; ...@@ -61,7 +61,7 @@ union specbinding *specpdl_ptr;
/* Depth in Lisp evaluations and function calls. */ /* Depth in Lisp evaluations and function calls. */
EMACS_INT lisp_eval_depth; static EMACS_INT lisp_eval_depth;
/* The value of num_nonmacro_input_events as of the last time we /* The value of num_nonmacro_input_events as of the last time we
started to enter the debugger. If we decide to enter the debugger started to enter the debugger. If we decide to enter the debugger
......
...@@ -3837,7 +3837,6 @@ intern_c_string (const char *str) ...@@ -3837,7 +3837,6 @@ intern_c_string (const char *str)
} }
/* Defined in eval.c. */ /* Defined in eval.c. */
extern EMACS_INT lisp_eval_depth;
extern Lisp_Object Vautoload_queue; extern Lisp_Object Vautoload_queue;
extern Lisp_Object Vrun_hooks; extern Lisp_Object Vrun_hooks;
extern Lisp_Object Vsignaling_function; extern Lisp_Object Vsignaling_function;
......
...@@ -697,7 +697,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0, ...@@ -697,7 +697,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0,
void *gpl_sym; void *gpl_sym;
CHECK_STRING (file); CHECK_STRING (file);
handle = dynlib_open (SDATA (file)); handle = dynlib_open (SSDATA (file));
if (!handle) if (!handle)
error ("Cannot load file %s: %s", SDATA (file), dynlib_error ()); error ("Cannot load file %s: %s", SDATA (file), dynlib_error ());
...@@ -789,6 +789,8 @@ ARGLIST is a list of arguments passed to SUBRPTR. */) ...@@ -789,6 +789,8 @@ ARGLIST is a list of arguments passed to SUBRPTR. */)
finalize_environment (&env); finalize_environment (&env);
Fthrow (tag, value); Fthrow (tag, value);
} }
default:
eassume (false);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment