Reverse out const to libpq interface from D'Arcy.

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 1881eb48e29f516f5dfab56276fda09ad47d65ce..bc463d37d49e2e41315107da6d9b580c27bcf3fb 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.90 1999/02/04 03:20:39 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.91 1999/02/05 04:25:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,7 @@ static PGconn *makeEmptyPGconn(void);
 static void freePGconn(PGconn *conn);
 static void closePGconn(PGconn *conn);
 static int     conninfo_parse(const char *conninfo, char *errorMessage);
-static const char *conninfo_getval(const char *keyword);
+static char *conninfo_getval(char *keyword);
 static void conninfo_free(void);
 static void defaultNoticeProcessor(void *arg, const char *message);
 
@@ -172,8 +172,8 @@ static struct EnvironmentOptions
 PGconn *
 PQconnectdb(const char *conninfo)
 {
-       PGconn             *conn;
-       const char         *tmp;
+       PGconn     *conn;
+       char       *tmp;
 
        /* ----------
         * Allocate memory for the conn structure
@@ -284,8 +284,8 @@ PQconndefaults(void)
 PGconn *
 PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, const char *pgtty, const char *dbName, const char *login, const char *pwd)
 {
-       PGconn          *conn;
-       const char      *tmp;
+       PGconn     *conn;
+       char       *tmp;
 
        /* An error message from some service we call. */
        bool            error = FALSE;
@@ -1137,7 +1137,7 @@ conninfo_parse(const char *conninfo, char *errorMessage)
        char       *pname;
        char       *pval;
        char       *buf;
-       const char *tmp;
+       char       *tmp;
        char       *cp;
        char       *cp2;
        PQconninfoOption *option;
@@ -1343,8 +1343,8 @@ conninfo_parse(const char *conninfo, char *errorMessage)
 }
 
 
-static const char *
-conninfo_getval(const char *keyword)
+static char *
+conninfo_getval(char *keyword)
 {
        PQconninfoOption *option;
 

diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 8cc34afa97eab71b54555518c3537281dfd5ca09..3273bcb4dfb9e8921ec6e5a08493e191031a4dca 100644 (file)
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -9,7 +9,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.18 1999/02/04 03:20:39 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.19 1999/02/05 04:25:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -679,7 +679,7 @@ do_header(FILE *fout, PQprintOpt *po, const int nFields, int *fieldMax,
                p = border;
                if (po->standard)
                {
-                       const char         *fs = po->fieldSep;
+                       char       *fs = po->fieldSep;
 
                        while (*fs++)
                                *p++ = '+';
@@ -691,7 +691,7 @@ do_header(FILE *fout, PQprintOpt *po, const int nFields, int *fieldMax,
                        for (len = fieldMax[j] + (po->standard ? 2 : 0); len--; *p++ = '-');
                        if (po->standard || (j + 1) < nFields)
                        {
-                               const char         *fs = po->fieldSep;
+                               char       *fs = po->fieldSep;
 
                                while (*fs++)
                                        *p++ = '+';

diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 8fdf1dd0a3cb5f627cc98816b2a348dacea532dd..cedecd95c27b845f11715cf0b0997bc739bac646 100644 (file)
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.46 1999/02/04 03:20:39 momjian Exp $
+ * $Id: libpq-fe.h,v 1.47 1999/02/05 04:25:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,9 +100,9 @@ extern              "C"
                pqbool          html3;          /* output html tables */
                pqbool          expanded;       /* expand tables */
                pqbool          pager;          /* use pager for output if needed */
-               const char *fieldSep;   /* field separator */
-               const char *tableOpt;   /* insert to HTML <table ...> */
-               const char *caption;    /* HTML <caption> */
+               char       *fieldSep;   /* field separator */
+               char       *tableOpt;   /* insert to HTML <table ...> */
+               char       *caption;    /* HTML <caption> */
                char      **fieldName;  /* null terminated array of repalcement
                                                                 * field names */
        } PQprintOpt;
@@ -113,12 +113,12 @@ extern            "C"
  */
        typedef struct _PQconninfoOption
        {
-               const char      *keyword;       /* The keyword of the option                    */
-               const char      *envvar;        /* Fallback environment variable name   */
-               const char      *compiled;      /* Fallback compiled in default value   */
-               char            *val;           /* Options value                                                */
-               const char      *label;         /* Label for field in connect dialog    */
-               const char      *dispchar;      /* Character to display for this field  */
+               char       *keyword;    /* The keyword of the option                    */
+               char       *envvar;     /* Fallback environment variable name   */
+               char       *compiled;   /* Fallback compiled in default value   */
+               char       *val;                /* Options value                                                */
+               char       *label;              /* Label for field in connect dialog    */
+               char       *dispchar;   /* Character to display for this field  */
                                                                /* in a connect dialog. Values are:             */
                                                                /* ""   Display entered value as is  */
                                                                /* "*"  Password field - hide value  */