diff modules/postgresql/postgresql.c @ 4933:77e3b19bd245

merge
author Ben Wing <ben@xemacs.org>
date Sun, 24 Jan 2010 22:06:20 -0600
parents 8b63e21b0436
children 19a72041c5ed
line wrap: on
line diff
--- a/modules/postgresql/postgresql.c	Sun Jan 24 19:56:31 2010 +0000
+++ b/modules/postgresql/postgresql.c	Sun Jan 24 22:06:20 2010 -0600
@@ -120,7 +120,7 @@
 
 #define CHECK_LIVE_CONNECTION(P) do {					\
 	if (!P || (PQstatus (P) != CONNECTION_OK)) {			\
-		char *e = "bad value";					\
+		const char *e = "bad value";				\
 		if (P) e = PQerrorMessage (P);				\
 	 signal_ferror (Qprocess_error, "dead connection [%s]", e);	\
 	} } while (0)
@@ -203,7 +203,7 @@
   char buf[256];
   PGconn *P;
   ConnStatusType cst;
-  char *host="", *db="", *user="", *port="";
+  const char *host="", *db="", *user="", *port="";
 
   P = (XPGCONN (obj))->pgconn;
 
@@ -472,7 +472,7 @@
 {
   PGconn *P;
   Lisp_PGconn *lisp_pgconn;
-  char *error_message = "Out of Memory?";
+  const char *error_message = "Out of Memory?";
   char *c_conninfo;
 
   CHECK_STRING (conninfo);
@@ -517,7 +517,7 @@
 {
   PGconn *P;
   Lisp_PGconn *lisp_pgconn;
-  char *error_message = "Out of Memory?";
+  const char *error_message = "Out of Memory?";
   char *c_conninfo;
 
   CHECK_STRING (conninfo);
@@ -919,7 +919,8 @@
 
   R = PQexec (P, c_query);
   {
-    char *tag, buf[BLCKSZ];
+    const Ascbyte *tag;
+    char buf[BLCKSZ];
 
     if (!R) out_of_memory ("query: out of memory", Qunbound);
     else
@@ -992,7 +993,8 @@
   if (!R) return Qnil; /* not an error, there's no more data to get */
 
   {
-    char *tag, buf[BLCKSZ];
+    const Ascbyte *tag;
+    char buf[BLCKSZ];
 
     switch (PQresultStatus (R))
       {