rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fully const-ify PQconnectdbParams, PQconnectStartParams, and PQpingParams. 

The keywords and values arguments of these functions are more properly
declared "const char * const *" than just "const char **".

Lionel Elie Mamane, reviewed by Craig Ringer
This commit is contained in:
Tom Lane 2011-09-25 18:52:48 -04:00
parent d5aa7a9fe6
commit 2a571bc233
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/libpq.sgml
View File

@ -98,7 +98,9 @@
Makes a new connection to the database server. Makes a new connection to the database server.
<synopsis> <synopsis>
PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand_dbname); PGconn *PQconnectdbParams(const char * const *keywords,
const char * const *values,
int expand_dbname);
</synopsis> </synopsis>
</para> </para>
@ -730,8 +732,8 @@ PGconn *PQsetdb(char *pghost,
Make a connection to the database server in a nonblocking manner. Make a connection to the database server in a nonblocking manner.
<synopsis> <synopsis>
PGconn *PQconnectStartParams(const char **keywords, PGconn *PQconnectStartParams(const char * const *keywords,
const char **values, const char * const *values,
int expand_dbname); int expand_dbname);
PGconn *PQconnectStart(const char *conninfo); PGconn *PQconnectStart(const char *conninfo);
@ -1112,7 +1114,9 @@ PostgresPollingStatusType PQresetPoll(PGconn *conn);
values to obtain the server status. values to obtain the server status.
<synopsis> <synopsis>
PGPing PQpingParams(const char **keywords, const char **values, int expand_dbname); PGPing PQpingParams(const char * const *keywords,
const char * const *values,
int expand_dbname);
</synopsis> </synopsis>
The function returns one of the following values: The function returns one of the following values:

18
src/interfaces/libpq/fe-connect.c
View File

@ -291,8 +291,8 @@ static void freePGconn(PGconn *conn);
static void closePGconn(PGconn *conn); static void closePGconn(PGconn *conn);
static PQconninfoOption *conninfo_parse(const char *conninfo, static PQconninfoOption *conninfo_parse(const char *conninfo,
PQExpBuffer errorMessage, bool use_defaults); PQExpBuffer errorMessage, bool use_defaults);
static PQconninfoOption *conninfo_array_parse(const char **keywords, static PQconninfoOption *conninfo_array_parse(const char *const * keywords,
const char **values, PQExpBuffer errorMessage, const char *const * values, PQExpBuffer errorMessage,
bool use_defaults, int expand_dbname); bool use_defaults, int expand_dbname);
static char *conninfo_getval(PQconninfoOption *connOptions, static char *conninfo_getval(PQconninfoOption *connOptions,
const char *keyword); const char *keyword);
@ -362,8 +362,8 @@ pgthreadlock_t pg_g_threadlock = default_threadlock;
* call succeeded. * call succeeded.
*/ */
PGconn * PGconn *
PQconnectdbParams(const char **keywords, PQconnectdbParams(const char *const * keywords,
const char **values, const char *const * values,
int expand_dbname) int expand_dbname)
{ {
PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname); PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname);
@ -381,8 +381,8 @@ PQconnectdbParams(const char **keywords,
* check server status, accepting parameters identical to PQconnectdbParams * check server status, accepting parameters identical to PQconnectdbParams
*/ */
PGPing PGPing
PQpingParams(const char **keywords, PQpingParams(const char *const * keywords,
const char **values, const char *const * values,
int expand_dbname) int expand_dbname)
{ {
PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname); PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname);
@ -464,8 +464,8 @@ PQping(const char *conninfo)
* See PQconnectPoll for more info. * See PQconnectPoll for more info.
*/ */
PGconn * PGconn *
PQconnectStartParams(const char **keywords, PQconnectStartParams(const char *const * keywords,
const char **values, const char *const * values,
int expand_dbname) int expand_dbname)
{ {
PGconn *conn; PGconn *conn;
@ -4249,7 +4249,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
* keywords will take precedence, however. * keywords will take precedence, however.
*/ */
static PQconninfoOption * static PQconninfoOption *
conninfo_array_parse(const char **keywords, const char **values, conninfo_array_parse(const char *const * keywords, const char *const * values,
PQExpBuffer errorMessage, bool use_defaults, PQExpBuffer errorMessage, bool use_defaults,
int expand_dbname) int expand_dbname)
{ {

12
src/interfaces/libpq/libpq-fe.h
View File

@ -235,14 +235,14 @@ typedef struct pgresAttDesc
/* make a new client connection to the backend */ /* make a new client connection to the backend */
/* Asynchronous (non-blocking) */ /* Asynchronous (non-blocking) */
extern PGconn *PQconnectStart(const char *conninfo); extern PGconn *PQconnectStart(const char *conninfo);
extern PGconn *PQconnectStartParams(const char **keywords, extern PGconn *PQconnectStartParams(const char *const * keywords,
const char **values, int expand_dbname); const char *const * values, int expand_dbname);
extern PostgresPollingStatusType PQconnectPoll(PGconn *conn); extern PostgresPollingStatusType PQconnectPoll(PGconn *conn);
/* Synchronous (blocking) */ /* Synchronous (blocking) */
extern PGconn *PQconnectdb(const char *conninfo); extern PGconn *PQconnectdb(const char *conninfo);
extern PGconn *PQconnectdbParams(const char **keywords, extern PGconn *PQconnectdbParams(const char *const * keywords,
const char **values, int expand_dbname); const char *const * values, int expand_dbname);
extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport, extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport,
const char *pgoptions, const char *pgtty, const char *pgoptions, const char *pgtty,
const char *dbName, const char *dbName,
@ -413,8 +413,8 @@ extern int PQsetnonblocking(PGconn *conn, int arg);
extern int PQisnonblocking(const PGconn *conn); extern int PQisnonblocking(const PGconn *conn);
extern int PQisthreadsafe(void); extern int PQisthreadsafe(void);
extern PGPing PQping(const char *conninfo); extern PGPing PQping(const char *conninfo);
extern PGPing PQpingParams(const char **keywords, extern PGPing PQpingParams(const char *const * keywords,
const char **values, int expand_dbname); const char *const * values, int expand_dbname);
/* Force the write buffer to be written (or at least try) */ /* Force the write buffer to be written (or at least try) */
extern int PQflush(PGconn *conn); extern int PQflush(PGconn *conn);