Mercurial > hg > xemacs-beta

diff src/postgresql.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 1ccc32a20af4
children 943eaba38521
line wrap: on
line diff
--- a/src/postgresql.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/postgresql.c	Thu May 24 07:51:33 2001 +0000
@@ -113,15 +113,15 @@
 Lisp_Object Vpg_coding_system;
 #endif
 
-#define CHECK_LIVE_CONNECTION(P) { \
-	if (!P || (PQstatus (P) != CONNECTION_OK)) { \
-		char *e = "bad value"; \
-		if (P) e = PQerrorMessage (P); \
-		error ("dead connection [%s]", e); \
-	} }
-#define PUKE_IF_NULL(p) { \
-	if (!p) error ("bad value"); \
-	}
+#define CHECK_LIVE_CONNECTION(P) do {					\
+	if (!P || (PQstatus (P) != CONNECTION_OK)) {			\
+		char *e = "bad value";					\
+		if (P) e = PQerrorMessage (P);				\
+	 signal_ferror (Qprocess_error, "dead connection [%s]", e);	\
+	} } while (0)
+#define PUKE_IF_NULL(p) do {						 \
+	if (!p) signal_error (Qinvalid_argument, "bad value", Qunbound); \
+	} while (0)
 
 static Lisp_Object VXPGHOST;
 static Lisp_Object VXPGUSER;
@@ -220,7 +220,7 @@
     strcpy (buf, "#<PGconn connecting>"); /* evil! */
 
   if (print_readably)
-    error ("printing unreadable object %s", buf);
+    printing_unreadable_object ("%s", buf);
   else
     write_c_string (buf, printcharfun);
 }
@@ -245,8 +245,8 @@
   Lisp_PGconn *pgconn = (Lisp_PGconn *)header;
 
   if (for_disksave)
-    signal_simple_error ("Can't dump an emacs containing PGconn objects",
-                         make_pgconn (pgconn));
+    invalid_operation ("Can't dump an emacs containing PGconn objects",
+		       make_pgconn (pgconn));
 
   if (pgconn->pgconn)
     {
@@ -335,7 +335,7 @@
     strcpy (buf, "#<PGresult DEAD>"); /* evil! */
 
   if (print_readably)
-    error ("printing unreadable object %s", buf);
+    printing_unreadable_object ("%s", buf);
   else
     write_c_string (buf, printcharfun);
 }
@@ -364,8 +364,8 @@
   Lisp_PGresult *pgresult = (Lisp_PGresult *)header;
 
   if (for_disksave)
-    signal_simple_error ("Can't dump an emacs containing PGresult objects",
-                         make_pgresult (pgresult));
+    invalid_operation ("Can't dump an emacs containing PGresult objects",
+		       make_pgresult (pgresult));
 
   if (pgresult->pgresult)
     {
@@ -482,7 +482,7 @@
 	  buf[sizeof (buf) - 1] = '\0';
 	  PQfinish (P);
 	}
-      error ("libpq: %s", buf);
+      signal_ferror (Qprocess_error, "libpq: %s", buf);
     }
 }
 
@@ -525,7 +525,7 @@
 	  buf[sizeof (buf) - 1] = '\0';
 	  PQfinish (P);
 	}
-      error ("libpq: %s", buf);
+      signal_ferror (Qprocess_error, "libpq: %s", buf);
     }
 }
 
@@ -549,7 +549,7 @@
       /* Something Bad has happened */
       {
 	char *e = PQerrorMessage (P);
-	error ("libpq: %s", e);
+	signal_ferror (Qprocess_error, "libpq: %s", e);
       }
     case PGRES_POLLING_OK:
       return Qpgres_polling_ok;
@@ -561,7 +561,7 @@
       return Qpgres_polling_active;
     default:
       /* they've added a new field we don't know about */
-      error ("Help!  Unknown status code %08x from backend!", polling_status);
+      signal_ferror (Qprocess_error, "Help!  Unknown status code %08x from backend!", polling_status);
     }
 }
 
@@ -599,7 +599,7 @@
 		      C_STRING_ALLOCA, c_encoding, Qnative);
 
   if ((rc = PQsetClientEncoding (P, c_encoding)) < 0)
-    error ("bad encoding");
+    signal_error (Qinvalid_argument, "bad encoding", Qunbound);
   else
     return make_int (rc);
 }
@@ -715,7 +715,7 @@
   if (PQresetStart (P)) return Qt;
   {
     char *e = PQerrorMessage (P);
-    error ("libpq: %s", e);
+    signal_ferror (Qprocess_error, "libpq: %s", e);
   }
 }
 
@@ -739,7 +739,7 @@
       /* Something Bad has happened */
       {
 	char *e = PQerrorMessage (P);
-	error ("libpq: %s", e);
+	signal_ferror (Qprocess_error, "libpq: %s", e);
       }
     case PGRES_POLLING_OK:
       return Qpgres_polling_ok;
@@ -751,7 +751,7 @@
       return Qpgres_polling_active;
     default:
       /* they've added a new field we don't know about */
-      error ("Help!  Unknown status code %08x from backend!", polling_status);
+      signal_ferror (Qprocess_error, "Help!  Unknown status code %08x from backend!", polling_status);
     }
 }
 #endif
@@ -859,7 +859,7 @@
 #endif /* HAVE_POSTGRESQLV7 */
 	default:
 	  /* they've added a new field we don't know about */
-	  error ("Help!  Unknown connection status code %08x from backend!", cst);
+	  signal_ferror (Qprocess_error, "Help!  Unknown connection status code %08x from backend!", cst);
 	}
     }
   else if (EQ (field, Qpqerrormessage))
@@ -875,7 +875,7 @@
      */
     return make_int (PQbackendPID(P));
   else
-    error ("bad PGconn accessor");
+    signal_error (Qinvalid_argument, "bad PGconn accessor", Qunbound);
 }
 
 /* Query functions */
@@ -902,7 +902,7 @@
   {
     char *tag, buf[BLCKSZ];
 
-    if (!R) error ("query: out of memory");
+    if (!R) out_of_memory ("query: out of memory", Qunbound);
     else
       switch (PQresultStatus (R))
 	{
@@ -918,7 +918,7 @@
 	  strncpy (buf, PQresultErrorMessage (R), sizeof (buf));
 	  buf [sizeof (buf) - 1] = '\0';
 	  PQclear (R);
-	  error (tag, buf);
+	  signal_ferror (Qprocess_error, tag, buf);
 	  /*NOTREACHED*/
 	default:
 	  break;
@@ -951,7 +951,7 @@
 		      C_STRING_ALLOCA, c_query, Qnative);
 
   if (PQsendQuery (P, c_query)) return Qt;
-  else error ("async query: %s", PQerrorMessage (P));
+  else signal_ferror (Qprocess_error, "async query: %s", PQerrorMessage (P));
 }
 
 DEFUN ("pq-get-result", Fpq_get_result, 1, 1, 0, /*
@@ -989,7 +989,7 @@
 	strncpy (buf, PQresultErrorMessage (R), sizeof (buf));
 	buf[sizeof (buf) - 1] = '\0';
 	PQclear (R);
-	error (tag, buf);
+	signal_ferror (Qprocess_error, tag, buf);
 	/*NOTREACHED*/
       default:
 	break;
@@ -1025,7 +1025,7 @@
   case PGRES_FATAL_ERROR: return Qpgres_fatal_error;
   default:
     /* they've added a new field we don't know about */
-    error ("Help!  Unknown exec status code %08x from backend!", est);
+    signal_ferror (Qprocess_error, "Help!  Unknown exec status code %08x from backend!", est);
   }
 }
 
@@ -1434,10 +1434,10 @@
   else if (EQ (status, Qpgres_bad_response)) est = PGRES_BAD_RESPONSE;
   else if (EQ (status, Qpgres_nonfatal_error)) est = PGRES_NONFATAL_ERROR;
   else if (EQ (status, Qpgres_fatal_error)) est = PGRES_FATAL_ERROR;
-  else signal_simple_error ("bad status symbol", status);
+  else invalid_constant ("bad status symbol", status);
 
   R = PQmakeEmptyPGresult (P, est);
-  if (!R) error ("out of memory?");
+  if (!R) out_of_memory (0, Qunbound);
 
   lpgr = allocate_pgresult ();
   lpgr->pgresult = R;
@@ -1582,11 +1582,11 @@
   INIT_LRECORD_IMPLEMENTATION (pgconn);
   INIT_LRECORD_IMPLEMENTATION (pgresult);
 #endif
-  defsymbol (&Qpostgresql, "postgresql");
+  DEFSYMBOL (Qpostgresql);
 
   /* opaque exported types */
-  defsymbol (&Qpgconnp, "pgconnp");
-  defsymbol (&Qpgresultp, "pgresultp");
+  DEFSYMBOL (Qpgconnp);
+  DEFSYMBOL (Qpgresultp);
 
   /* connection status types */
   defsymbol (&Qpg_connection_ok, "pg::connection-ok");