Mercurial > hg > xemacs-beta

diff src/emodules.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 576fb035e263
children 001628b7a5b3
line wrap: on
line diff
--- a/src/emodules.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/emodules.c	Thu May 24 07:51:33 2001 +0000
@@ -327,7 +327,7 @@
   dlhandle = 0;
 
   if ((module == (const char *)0) || (module[0] == '\0'))
-    error ("Empty module name");
+    invalid_argument ("Empty module name", Qunbound);
 
   /* This is to get around the fact that build_string() is not declared
      as taking a const char * as an argument. I HATE compiler warnings. */
@@ -336,46 +336,51 @@
 
   GCPRO2(filename, foundname);
   filename = build_string (tmod);
-  fd = locate_file(Vmodule_load_path, filename, Vmodule_extensions,
-		   &foundname, -1);
+  fd = locate_file (Vmodule_load_path, filename, Vmodule_extensions,
+		    &foundname, -1);
   UNGCPRO;
 
   if (fd < 0)
-    signal_simple_error ("Cannot open dynamic module", filename);
+    signal_error (Qdll_error, "Cannot open dynamic module", filename);
 
   soname = (char *)alloca (XSTRING_LENGTH (foundname) + 1);
   strcpy (soname, (char *)XSTRING_DATA (foundname));
 
   dlhandle = dll_open (soname);
   if (dlhandle == (dll_handle)0)
-    error ("Opening dynamic module: %s", dll_error (dlhandle));
+    {
+      Bufbyte *dllerrint;
+
+      EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative);
+      signal_error (Qdll_error, "Opening dynamic module",
+		    build_string (dllerrint));
+    }
 
   ellcc_rev = (const long *)dll_variable (dlhandle, "emodule_compiler");
   if ((ellcc_rev == (const long *)0) || (*ellcc_rev <= 0))
-    error ("Missing symbol `emodule_compiler': Invalid dynamic module");
+    signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_compiler'", Qunbound);
   if (*ellcc_rev > EMODULES_REVISION)
-    error ("Unsupported version `%ld(%ld)': Invalid dynamic module",
-           *ellcc_rev, EMODULES_REVISION);
+    signal_ferror (Qdll_error, "Invalid dynamic module: Unsupported version `%ld(%ld)'", *ellcc_rev, EMODULES_REVISION);
 
   f = (const char **)dll_variable (dlhandle, "emodule_name");
   if ((f == (const char **)0) || (*f == (const char *)0))
-    error ("Missing symbol `emodule_name': Invalid dynamic module");
+    signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_name'", Qunbound);
 
   mname = (char *)alloca (strlen (*f) + 1);
   strcpy (mname, *f);
   if (mname[0] == '\0')
-    error ("Empty value for `emodule_name': Invalid dynamic module");
+    signal_error (Qdll_error, "Invalid dynamic module: Empty value for `emodule_name'", Qunbound);
 
   f = (const char **)dll_variable (dlhandle, "emodule_version");
   if ((f == (const char **)0) || (*f == (const char *)0))
-    error ("Missing symbol `emodule_version': Invalid dynamic module");
+    signal_error (Qdll_error, "Missing symbol `emodule_version': Invalid dynamic module", Qunbound);
 
   mver = (char *)alloca (strlen (*f) + 1);
   strcpy (mver, *f);
 
   f = (const char **)dll_variable (dlhandle, "emodule_title");
   if ((f == (const char **)0) || (*f == (const char *)0))
-    error ("Missing symbol `emodule_title': Invalid dynamic module");
+    signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_title'", Qunbound);
 
   mtitle = (char *)alloca (strlen (*f) + 1);
   strcpy (mtitle, *f);
@@ -394,25 +399,29 @@
   strcat (symname, mname);
   modsyms = (void (*)(void))dll_function (dlhandle, symname);
   if (modsyms == (void (*)(void))0)
-    error ("Missing symbol `%s': Invalid dynamic module", symname);
+    {
+    missing_symbol:
+      signal_error (Qdll_error, "Invalid dynamic module: Missing symbol",
+		    build_string (symname));
+    }
 
   strcpy (symname, "vars_of_");
   strcat (symname, mname);
   modvars = (void (*)(void))dll_function (dlhandle, symname);
   if (modvars == (void (*)(void))0)
-    error ("Missing symbol `%s': Invalid dynamic module", symname);
+    goto missing_symbol;
 
   strcpy (symname, "docs_of_");
   strcat (symname, mname);
   moddocs = (void (*)(void))dll_function (dlhandle, symname);
   if (moddocs == (void (*)(void))0)
-    error ("Missing symbol `%s': Invalid dynamic module", symname);
+    goto missing_symbol;
 
   if (modname && modname[0] && strcmp (modname, mname))
-    error ("Module name mismatch");
+    signal_error (Qdll_error, "Module name mismatch", Qunbound);
 
   if (modver && modver[0] && strcmp (modver, mver))
-    error ("Module version mismatch");
+    signal_error (Qdll_error, "Module version mismatch", Qunbound);
 
   /*
    * Attempt to make a new slot for this module. If this really is the