Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2a571bc

Browse files
committed
Fully const-ify PQconnectdbParams, PQconnectStartParams, and PQpingParams.
The keywords and values arguments of these functions are more properlydeclared "const char * const *" than just "const char **".Lionel Elie Mamane, reviewed by Craig Ringer
1 parentd5aa7a9 commit2a571bc

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@
9898
Makes a new connection to the database server.
9999

100100
<synopsis>
101-
PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand_dbname);
101+
PGconn *PQconnectdbParams(const char * const *keywords,
102+
const char * const *values,
103+
int expand_dbname);
102104
</synopsis>
103105
</para>
104106

@@ -730,8 +732,8 @@ PGconn *PQsetdb(char *pghost,
730732
Make a connection to the database server in a nonblocking manner.
731733

732734
<synopsis>
733-
PGconn *PQconnectStartParams(const char **keywords,
734-
const char **values,
735+
PGconn *PQconnectStartParams(const char * const*keywords,
736+
const char * const*values,
735737
int expand_dbname);
736738

737739
PGconn *PQconnectStart(const char *conninfo);
@@ -1112,7 +1114,9 @@ PostgresPollingStatusType PQresetPoll(PGconn *conn);
11121114
values to obtain the server status.
11131115

11141116
<synopsis>
1115-
PGPing PQpingParams(const char **keywords, const char **values, int expand_dbname);
1117+
PGPing PQpingParams(const char * const *keywords,
1118+
const char * const *values,
1119+
int expand_dbname);
11161120
</synopsis>
11171121

11181122
The function returns one of the following values:

‎src/interfaces/libpq/fe-connect.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ static void freePGconn(PGconn *conn);
291291
staticvoidclosePGconn(PGconn*conn);
292292
staticPQconninfoOption*conninfo_parse(constchar*conninfo,
293293
PQExpBuffererrorMessage,booluse_defaults);
294-
staticPQconninfoOption*conninfo_array_parse(constchar**keywords,
295-
constchar**values,PQExpBuffererrorMessage,
294+
staticPQconninfoOption*conninfo_array_parse(constchar*const*keywords,
295+
constchar*const*values,PQExpBuffererrorMessage,
296296
booluse_defaults,intexpand_dbname);
297297
staticchar*conninfo_getval(PQconninfoOption*connOptions,
298298
constchar*keyword);
@@ -362,8 +362,8 @@ pgthreadlock_t pg_g_threadlock = default_threadlock;
362362
* call succeeded.
363363
*/
364364
PGconn*
365-
PQconnectdbParams(constchar**keywords,
366-
constchar**values,
365+
PQconnectdbParams(constchar*const*keywords,
366+
constchar*const*values,
367367
intexpand_dbname)
368368
{
369369
PGconn*conn=PQconnectStartParams(keywords,values,expand_dbname);
@@ -381,8 +381,8 @@ PQconnectdbParams(const char **keywords,
381381
* check server status, accepting parameters identical to PQconnectdbParams
382382
*/
383383
PGPing
384-
PQpingParams(constchar**keywords,
385-
constchar**values,
384+
PQpingParams(constchar*const*keywords,
385+
constchar*const*values,
386386
intexpand_dbname)
387387
{
388388
PGconn*conn=PQconnectStartParams(keywords,values,expand_dbname);
@@ -464,8 +464,8 @@ PQping(const char *conninfo)
464464
* See PQconnectPoll for more info.
465465
*/
466466
PGconn*
467-
PQconnectStartParams(constchar**keywords,
468-
constchar**values,
467+
PQconnectStartParams(constchar*const*keywords,
468+
constchar*const*values,
469469
intexpand_dbname)
470470
{
471471
PGconn*conn;
@@ -4249,7 +4249,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
42494249
* keywords will take precedence, however.
42504250
*/
42514251
staticPQconninfoOption*
4252-
conninfo_array_parse(constchar**keywords,constchar**values,
4252+
conninfo_array_parse(constchar*const*keywords,constchar*const*values,
42534253
PQExpBuffererrorMessage,booluse_defaults,
42544254
intexpand_dbname)
42554255
{

‎src/interfaces/libpq/libpq-fe.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,14 @@ typedef struct pgresAttDesc
235235
/* make a new client connection to the backend */
236236
/* Asynchronous (non-blocking) */
237237
externPGconn*PQconnectStart(constchar*conninfo);
238-
externPGconn*PQconnectStartParams(constchar**keywords,
239-
constchar**values,intexpand_dbname);
238+
externPGconn*PQconnectStartParams(constchar*const*keywords,
239+
constchar*const*values,intexpand_dbname);
240240
externPostgresPollingStatusTypePQconnectPoll(PGconn*conn);
241241

242242
/* Synchronous (blocking) */
243243
externPGconn*PQconnectdb(constchar*conninfo);
244-
externPGconn*PQconnectdbParams(constchar**keywords,
245-
constchar**values,intexpand_dbname);
244+
externPGconn*PQconnectdbParams(constchar*const*keywords,
245+
constchar*const*values,intexpand_dbname);
246246
externPGconn*PQsetdbLogin(constchar*pghost,constchar*pgport,
247247
constchar*pgoptions,constchar*pgtty,
248248
constchar*dbName,
@@ -413,8 +413,8 @@ extern intPQsetnonblocking(PGconn *conn, int arg);
413413
externintPQisnonblocking(constPGconn*conn);
414414
externintPQisthreadsafe(void);
415415
externPGPingPQping(constchar*conninfo);
416-
externPGPingPQpingParams(constchar**keywords,
417-
constchar**values,intexpand_dbname);
416+
externPGPingPQpingParams(constchar*const*keywords,
417+
constchar*const*values,intexpand_dbname);
418418

419419
/* Force the write buffer to be written (or at least try) */
420420
externintPQflush(PGconn*conn);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp