Mercurial > hg > xemacs-beta

diff src/eldap.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 c33ae14dd6d0
children 6db80f4ab17c
line wrap: on
line diff
--- a/src/eldap.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/eldap.c	Thu May 24 07:51:33 2001 +0000
@@ -82,7 +82,7 @@
       ldap_err = ld->ld_errno;
 #endif
     }
-  signal_simple_error ("LDAP error",
+  invalid_operation ("LDAP error",
                        build_string (ldap_err2string (ldap_err)));
 }
 
@@ -113,8 +113,7 @@
   Lisp_LDAP *ldap = XLDAP (obj);
 
   if (print_readably)
-    error ("printing unreadable object #<ldap %s>",
-           XSTRING_DATA (ldap->host));
+    printing_unreadable_object ("#<ldap %s>", XSTRING_DATA (ldap->host));
 
   write_c_string ("#<ldap ", printcharfun);
   print_internal (ldap->host, printcharfun, 1);
@@ -140,7 +139,7 @@
   Lisp_LDAP *ldap = (Lisp_LDAP *) header;
 
   if (for_disksave)
-    signal_simple_error ("Can't dump an emacs containing LDAP objects",
+    invalid_operation ("Can't dump an emacs containing LDAP objects",
 			 make_ldap (ldap));
 
   if (ldap->ld)
@@ -243,7 +242,7 @@
 	      ldap_auth = LDAP_AUTH_KRBV42;
 #endif
 	    else
-	      signal_simple_error ("Invalid authentication method", value);
+	      invalid_constant ("Invalid authentication method", value);
 	  }
 	/* Bind DN */
 	else if (EQ (keyword, Qbinddn))
@@ -269,7 +268,7 @@
 	    else if (EQ (value, Qalways))
 	      ldap_deref = LDAP_DEREF_ALWAYS;
 	    else
-	      signal_simple_error ("Invalid deref value", value);
+	      invalid_constant ("Invalid deref value", value);
 	  }
 	/* Timelimit */
 	else if (EQ (keyword, Qtimelimit))
@@ -297,10 +296,7 @@
   speed_up_interrupts ();
 
   if (ld == NULL )
-    signal_simple_error_2 ("Failed connecting to host",
-                           host,
-                           lisp_strerror (errno));
-
+    report_process_error ("Failed connecting to host", host);
 
 #ifdef HAVE_LDAP_SET_OPTION
   if ((err = ldap_set_option (ld, LDAP_OPT_DEREF,
@@ -333,8 +329,12 @@
 
   err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth);
   if (err != LDAP_SUCCESS)
-    signal_simple_error ("Failed binding to the server",
-                         build_string (ldap_err2string (err)));
+    {
+      Bufbyte *interrmess;
+      EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative);
+      signal_error (Qprocess_error, "Failed binding to the server",
+		    build_string (interrmess));
+    }
 
   ldap = allocate_ldap ();
   ldap->ld = ld;
@@ -459,7 +459,7 @@
       else if (EQ (scope, Qsubtree))
         ldap_scope = LDAP_SCOPE_SUBTREE;
       else
-        signal_simple_error ("Invalid scope", scope);
+        invalid_constant ("Invalid scope", scope);
     }
 
   /* Attributes to search */
@@ -619,7 +619,7 @@
   /* Check the entry */
   CHECK_CONS (entry);
   if (NILP (entry))
-    signal_simple_error ("Cannot add void entry", entry);
+    invalid_operation ("Cannot add void entry", entry);
 
   /* Build the ldap_mods array */
   len = XINT (Flength (entry));
@@ -735,7 +735,7 @@
       else if (EQ (mod_op, Qreplace))
         ldap_mods[i].mod_op |= LDAP_MOD_REPLACE;
       else
-        signal_simple_error ("Invalid LDAP modification type", mod_op);
+        invalid_constant ("Invalid LDAP modification type", mod_op);
       current = XCDR (current);
       CHECK_STRING (XCAR (current));
       LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type, Qnative);
@@ -796,24 +796,24 @@
 {
   INIT_LRECORD_IMPLEMENTATION (ldap);
 
-  defsymbol (&Qldapp, "ldapp");
-  defsymbol (&Qport, "port");
-  defsymbol (&Qauth, "auth");
-  defsymbol (&Qbinddn, "binddn");
-  defsymbol (&Qpasswd, "passwd");
-  defsymbol (&Qderef, "deref");
-  defsymbol (&Qtimelimit, "timelimit");
-  defsymbol (&Qsizelimit, "sizelimit");
-  defsymbol (&Qbase, "base");
-  defsymbol (&Qonelevel, "onelevel");
-  defsymbol (&Qsubtree, "subtree");
-  defsymbol (&Qkrbv41, "krbv41");
-  defsymbol (&Qkrbv42, "krbv42");
-  defsymbol (&Qnever, "never");
-  defsymbol (&Qalways, "always");
-  defsymbol (&Qfind, "find");
-  defsymbol (&Qadd, "add");
-  defsymbol (&Qreplace, "replace");
+  DEFSYMBOL (Qldapp);
+  DEFSYMBOL (Qport);
+  DEFSYMBOL (Qauth);
+  DEFSYMBOL (Qbinddn);
+  DEFSYMBOL (Qpasswd);
+  DEFSYMBOL (Qderef);
+  DEFSYMBOL (Qtimelimit);
+  DEFSYMBOL (Qsizelimit);
+  DEFSYMBOL (Qbase);
+  DEFSYMBOL (Qonelevel);
+  DEFSYMBOL (Qsubtree);
+  DEFSYMBOL (Qkrbv41);
+  DEFSYMBOL (Qkrbv42);
+  DEFSYMBOL (Qnever);
+  DEFSYMBOL (Qalways);
+  DEFSYMBOL (Qfind);
+  DEFSYMBOL (Qadd);
+  DEFSYMBOL (Qreplace);
 
   DEFSUBR (Fldapp);
   DEFSUBR (Fldap_host);