Mercurial > hg > xemacs-beta
comparison src/emodules.c @ 563:183866b06e0b
[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 |
comparison
equal
deleted
inserted
replaced
562:c775bd016b32 | 563:183866b06e0b |
---|---|
325 | 325 |
326 emodules_depth++; | 326 emodules_depth++; |
327 dlhandle = 0; | 327 dlhandle = 0; |
328 | 328 |
329 if ((module == (const char *)0) || (module[0] == '\0')) | 329 if ((module == (const char *)0) || (module[0] == '\0')) |
330 error ("Empty module name"); | 330 invalid_argument ("Empty module name", Qunbound); |
331 | 331 |
332 /* This is to get around the fact that build_string() is not declared | 332 /* This is to get around the fact that build_string() is not declared |
333 as taking a const char * as an argument. I HATE compiler warnings. */ | 333 as taking a const char * as an argument. I HATE compiler warnings. */ |
334 tmod = (char *)alloca (strlen (module) + 1); | 334 tmod = (char *)alloca (strlen (module) + 1); |
335 strcpy (tmod, module); | 335 strcpy (tmod, module); |
336 | 336 |
337 GCPRO2(filename, foundname); | 337 GCPRO2(filename, foundname); |
338 filename = build_string (tmod); | 338 filename = build_string (tmod); |
339 fd = locate_file(Vmodule_load_path, filename, Vmodule_extensions, | 339 fd = locate_file (Vmodule_load_path, filename, Vmodule_extensions, |
340 &foundname, -1); | 340 &foundname, -1); |
341 UNGCPRO; | 341 UNGCPRO; |
342 | 342 |
343 if (fd < 0) | 343 if (fd < 0) |
344 signal_simple_error ("Cannot open dynamic module", filename); | 344 signal_error (Qdll_error, "Cannot open dynamic module", filename); |
345 | 345 |
346 soname = (char *)alloca (XSTRING_LENGTH (foundname) + 1); | 346 soname = (char *)alloca (XSTRING_LENGTH (foundname) + 1); |
347 strcpy (soname, (char *)XSTRING_DATA (foundname)); | 347 strcpy (soname, (char *)XSTRING_DATA (foundname)); |
348 | 348 |
349 dlhandle = dll_open (soname); | 349 dlhandle = dll_open (soname); |
350 if (dlhandle == (dll_handle)0) | 350 if (dlhandle == (dll_handle)0) |
351 error ("Opening dynamic module: %s", dll_error (dlhandle)); | 351 { |
352 Bufbyte *dllerrint; | |
353 | |
354 EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative); | |
355 signal_error (Qdll_error, "Opening dynamic module", | |
356 build_string (dllerrint)); | |
357 } | |
352 | 358 |
353 ellcc_rev = (const long *)dll_variable (dlhandle, "emodule_compiler"); | 359 ellcc_rev = (const long *)dll_variable (dlhandle, "emodule_compiler"); |
354 if ((ellcc_rev == (const long *)0) || (*ellcc_rev <= 0)) | 360 if ((ellcc_rev == (const long *)0) || (*ellcc_rev <= 0)) |
355 error ("Missing symbol `emodule_compiler': Invalid dynamic module"); | 361 signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_compiler'", Qunbound); |
356 if (*ellcc_rev > EMODULES_REVISION) | 362 if (*ellcc_rev > EMODULES_REVISION) |
357 error ("Unsupported version `%ld(%ld)': Invalid dynamic module", | 363 signal_ferror (Qdll_error, "Invalid dynamic module: Unsupported version `%ld(%ld)'", *ellcc_rev, EMODULES_REVISION); |
358 *ellcc_rev, EMODULES_REVISION); | |
359 | 364 |
360 f = (const char **)dll_variable (dlhandle, "emodule_name"); | 365 f = (const char **)dll_variable (dlhandle, "emodule_name"); |
361 if ((f == (const char **)0) || (*f == (const char *)0)) | 366 if ((f == (const char **)0) || (*f == (const char *)0)) |
362 error ("Missing symbol `emodule_name': Invalid dynamic module"); | 367 signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_name'", Qunbound); |
363 | 368 |
364 mname = (char *)alloca (strlen (*f) + 1); | 369 mname = (char *)alloca (strlen (*f) + 1); |
365 strcpy (mname, *f); | 370 strcpy (mname, *f); |
366 if (mname[0] == '\0') | 371 if (mname[0] == '\0') |
367 error ("Empty value for `emodule_name': Invalid dynamic module"); | 372 signal_error (Qdll_error, "Invalid dynamic module: Empty value for `emodule_name'", Qunbound); |
368 | 373 |
369 f = (const char **)dll_variable (dlhandle, "emodule_version"); | 374 f = (const char **)dll_variable (dlhandle, "emodule_version"); |
370 if ((f == (const char **)0) || (*f == (const char *)0)) | 375 if ((f == (const char **)0) || (*f == (const char *)0)) |
371 error ("Missing symbol `emodule_version': Invalid dynamic module"); | 376 signal_error (Qdll_error, "Missing symbol `emodule_version': Invalid dynamic module", Qunbound); |
372 | 377 |
373 mver = (char *)alloca (strlen (*f) + 1); | 378 mver = (char *)alloca (strlen (*f) + 1); |
374 strcpy (mver, *f); | 379 strcpy (mver, *f); |
375 | 380 |
376 f = (const char **)dll_variable (dlhandle, "emodule_title"); | 381 f = (const char **)dll_variable (dlhandle, "emodule_title"); |
377 if ((f == (const char **)0) || (*f == (const char *)0)) | 382 if ((f == (const char **)0) || (*f == (const char *)0)) |
378 error ("Missing symbol `emodule_title': Invalid dynamic module"); | 383 signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_title'", Qunbound); |
379 | 384 |
380 mtitle = (char *)alloca (strlen (*f) + 1); | 385 mtitle = (char *)alloca (strlen (*f) + 1); |
381 strcpy (mtitle, *f); | 386 strcpy (mtitle, *f); |
382 | 387 |
383 symname = (char *)alloca (strlen (mname) + 15); | 388 symname = (char *)alloca (strlen (mname) + 15); |
392 | 397 |
393 strcpy (symname, "syms_of_"); | 398 strcpy (symname, "syms_of_"); |
394 strcat (symname, mname); | 399 strcat (symname, mname); |
395 modsyms = (void (*)(void))dll_function (dlhandle, symname); | 400 modsyms = (void (*)(void))dll_function (dlhandle, symname); |
396 if (modsyms == (void (*)(void))0) | 401 if (modsyms == (void (*)(void))0) |
397 error ("Missing symbol `%s': Invalid dynamic module", symname); | 402 { |
403 missing_symbol: | |
404 signal_error (Qdll_error, "Invalid dynamic module: Missing symbol", | |
405 build_string (symname)); | |
406 } | |
398 | 407 |
399 strcpy (symname, "vars_of_"); | 408 strcpy (symname, "vars_of_"); |
400 strcat (symname, mname); | 409 strcat (symname, mname); |
401 modvars = (void (*)(void))dll_function (dlhandle, symname); | 410 modvars = (void (*)(void))dll_function (dlhandle, symname); |
402 if (modvars == (void (*)(void))0) | 411 if (modvars == (void (*)(void))0) |
403 error ("Missing symbol `%s': Invalid dynamic module", symname); | 412 goto missing_symbol; |
404 | 413 |
405 strcpy (symname, "docs_of_"); | 414 strcpy (symname, "docs_of_"); |
406 strcat (symname, mname); | 415 strcat (symname, mname); |
407 moddocs = (void (*)(void))dll_function (dlhandle, symname); | 416 moddocs = (void (*)(void))dll_function (dlhandle, symname); |
408 if (moddocs == (void (*)(void))0) | 417 if (moddocs == (void (*)(void))0) |
409 error ("Missing symbol `%s': Invalid dynamic module", symname); | 418 goto missing_symbol; |
410 | 419 |
411 if (modname && modname[0] && strcmp (modname, mname)) | 420 if (modname && modname[0] && strcmp (modname, mname)) |
412 error ("Module name mismatch"); | 421 signal_error (Qdll_error, "Module name mismatch", Qunbound); |
413 | 422 |
414 if (modver && modver[0] && strcmp (modver, mver)) | 423 if (modver && modver[0] && strcmp (modver, mver)) |
415 error ("Module version mismatch"); | 424 signal_error (Qdll_error, "Module version mismatch", Qunbound); |
416 | 425 |
417 /* | 426 /* |
418 * Attempt to make a new slot for this module. If this really is the | 427 * Attempt to make a new slot for this module. If this really is the |
419 * first time we are loading this module, the used member will be 0. | 428 * first time we are loading this module, the used member will be 0. |
420 * If that is non-zero, we know that we have a previously loaded module | 429 * If that is non-zero, we know that we have a previously loaded module |