xemacs-beta: src/postgresql.c comparison

comparison src/postgresql.c @ 410:de805c49cfc1 r21-2-35

Import from CVS: tag r21-2-35

author	cvs
date	Mon, 13 Aug 2007 11:19:21 +0200
parents	501cfd01ee6d
children

comparison

equal deleted inserted replaced

-:301b9ebbdf3b
+:de805c49cfc1
 interface to lcrecord handling has changed with 21.2, so unfortunately
 we will need a few snippets of backwards compatibility code.
 */
 #if (EMACS_MAJOR_VERSION == 21) && (EMACS_MINOR_VERSION < 2)
 #define RUNNING_XEMACS_21_1 1
-#define POSTGRES_INCLUDE(file) <file>
 #endif
 /* #define POSTGRES_LO_IMPORT_IS_VOID 1 */
 #include "lisp.h"
 #include "sysdep.h"
 #include "buffer.h"
-#include POSTGRES_INCLUDE (libpq-fe.h)
 #include "postgresql.h"
 #ifdef RUNNING_XEMACS_21_1 /* handle interface changes */
-#define I_HATE_CONST CONST
 #define PG_OS_CODING FORMAT_FILENAME
 #define TO_EXTERNAL_FORMAT(a,from,b,to,c) GET_C_STRING_EXT_DATA_ALLOCA(from,FORMAT_FILENAME,to)
 #else
-#define I_HATE_CONST const
 #ifdef MULE
 #define PG_OS_CODING Fget_coding_system(Vpg_coding_system)
 #else
 #define PG_OS_CODING Qnative
 #endif
 /***********************/
 /* notices */
 static void
-xemacs_notice_processor (void *arg, I_HATE_CONST char *msg)
+xemacs_notice_processor (void *arg, const char *msg)
 {
 warn_when_safe (Qpostgresql, Qnotice, "%s", msg);
 }
 /* There are four ways (as of PostgreSQL v7) to connect to a database.
 error ("libpq: %s", e);
 }
 }
 DEFUN ("pq-reset-poll", Fpq_reset_poll, 1, 1, 0, /*
-Poll an asynchronous reset for completion
+Poll an asynchronous reset for completion.
 */
 	(conn))
 {
 PGconn *P;
 PostgresPollingStatusType polling_status;
 char *PQoptions(PGconn *conn)
 */
 return build_ext_string (PQoptions(P), PG_OS_CODING);
 else if (EQ (field, Qpqstatus))
 {
-ExecStatusType est;
+ConnStatusType cst;
 /* PQstatus Returns the status of the connection. The status can be
 	 CONNECTION_OK or CONNECTION_BAD.
 	 ConnStatusType PQstatus(PGconn *conn)
 */
-switch ((est = PQstatus (P)))
+switch ((cst = PQstatus (P)))
 	{
 	case CONNECTION_OK: return Qpg_connection_ok;
 	case CONNECTION_BAD: return Qpg_connection_bad;
 #ifdef HAVE_POSTGRESQLV7
 	case CONNECTION_STARTED: return Qpg_connection_started;
 	case CONNECTION_AUTH_OK: return Qpg_connection_auth_ok;
 	case CONNECTION_SETENV: return Qpg_connection_setenv;
 #endif /* HAVE_POSTGRESQLV7 */
 	default:
 	  /* they've added a new field we don't know about */
-	  error ("Help!  Unknown exec status code %08x from backend!", est);
+	  error ("Help!  Unknown connection status code %08x from backend!", cst);
 	}
 }
 else if (EQ (field, Qpqerrormessage))
 /* PQerrorMessage Returns the error message most recently generated
 by an operation on the connection.
 return build_ext_string (PQcmdStatus (R), PG_OS_CODING);
 }
 DEFUN ("pq-cmd-tuples", Fpq_cmd_tuples, 1, 1, 0, /*
-Returns the number of rows affected by the SQL command
+Returns the number of rows affected by the SQL command.
 */
 	(result))
 {
 PGresult *R;
 return make_int (PQsetnonblocking (P, !NILP (arg)));
 }
 DEFUN ("pq-is-nonblocking", Fpq_is_nonblocking, 1, 1, 0, /*
-Return the blocking status of the database connection
+Return the blocking status of the database connection.
 */
 (conn))
 {
 PGconn *P;
 return PQisnonblocking (P) ? Qt : Qnil;
 }
 DEFUN ("pq-flush", Fpq_flush, 1, 1, 0, /*
-Force the write buffer to be written (or at least try)
+Force the write buffer to be written (or at least try).
 */
 (conn))
 {
 PGconn *P;
 ret = PQgetlineAsync (P, buffer, sizeof (buffer));
 if (ret == -1) return Qt; /* done! */
 else if (!ret) return Qnil; /* no data yet */
 else return Fcons (make_int (ret),
-		     make_ext_string (buffer, ret, PG_OS_CODING));
+		     make_ext_string ((Extbyte *) buffer, ret, PG_OS_CODING));
 }
 DEFUN ("pq-put-nbytes", Fpq_put_nbytes, 2, 2, 0, /*
 Asynchronous copy out.
 */

Mercurial > hg > xemacs-beta

comparison src/postgresql.c @ 410:de805c49cfc1 r21-2-35