Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c5bc705

Browse files
committed
Message style fixes
1 parent 021da89 commit c5bc705

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

src/bin/psql/command.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,7 @@ printGSSInfo(void)
32813281
if (!PQgssEncInUse(pset.db))
32823282
return; /* no GSSAPI encryption in use */
32833283

3284-
printf(_("GSSAPI Encrypted connection\n"));
3284+
printf(_("GSSAPI-encrypted connection\n"));
32853285
}
32863286

32873287

src/bin/psql/help.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ slashUsage(unsigned short int pager)
252252
fprintf(output, _(" \\do[S] [PATTERN] list operators\n"));
253253
fprintf(output, _(" \\dO[S+] [PATTERN] list collations\n"));
254254
fprintf(output, _(" \\dp [PATTERN] list table, view, and sequence access privileges\n"));
255-
fprintf(output, _(" \\dP[tin+] [PATTERN] list [only table/index] partitioned relations\n"));
255+
fprintf(output, _(" \\dP[itn+] [PATTERN] list [only index/table] partitioned relations [n=nested]\n"));
256256
fprintf(output, _(" \\drds [PATRN1 [PATRN2]] list per-database role settings\n"));
257257
fprintf(output, _(" \\dRp[+] [PATTERN] list replication publications\n"));
258258
fprintf(output, _(" \\dRs[+] [PATTERN] list replication subscriptions\n"));

src/interfaces/ecpg/ecpglib/error.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
204204
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
205205
/*------
206206
translator: this string will be truncated at 149 characters expanded. */
207-
ecpg_gettext("The cursor is invalid on line %d"), line);
207+
ecpg_gettext("cursor is invalid on line %d"), line);
208208
break;
209209

210210
default:

src/interfaces/ecpg/ecpglib/prepare.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ ECPGdeclare(int lineno, const char *connection_name, const char *name)
696696

697697
memset(p, 0, sizeof(struct declared_statement));
698698

699-
ecpg_log("ECPGdeclare on line %d: declared name %s on connection: \"%s\"\n", lineno, name, connection_name);
699+
ecpg_log("ECPGdeclare on line %d: declared name \"%s\" on connection: \"%s\"\n", lineno, name, connection_name);
700700

701701
p->name = ecpg_strdup(name, lineno);
702702
p->connection_name = ecpg_strdup(connection_name, lineno);
@@ -831,7 +831,7 @@ ecpg_release_declared_statement(const char *connection_name)
831831
else
832832
g_declared_list = cur->next;
833833

834-
ecpg_log("ecpg_release_declared_statement: declared name %s is released\n", cur->name);
834+
ecpg_log("ecpg_release_declared_statement: declared name \"%s\" is released\n", cur->name);
835835

836836
ecpg_free(cur->name);
837837
ecpg_free(cur->connection_name);

src/interfaces/ecpg/preproc/ecpg.trailer

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ ECPGDeclareStmt: DECLARE prepared_name STATEMENT
303303
if (strcmp($2, ptr->name) == 0)
304304
{
305305
/* re-definition is a bug */
306-
mmerror(PARSE_ERROR, ET_ERROR, "declared name %s is already defined", ptr->name);
306+
mmerror(PARSE_ERROR, ET_ERROR, "declared name \"%s\" is already defined", ptr->name);
307307
}
308308
}
309309

src/interfaces/ecpg/test/expected/sql-declare.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
[NO_PID]: sqlca: code: 0, state: 00000
9393
[NO_PID]: deallocate_one on line 86: name stmt_1
9494
[NO_PID]: sqlca: code: 0, state: 00000
95-
[NO_PID]: ECPGdeclare on line 98: declared name stmt_2 on connection: "con1"
95+
[NO_PID]: ECPGdeclare on line 98: declared name "stmt_2" on connection: "con1"
9696
[NO_PID]: sqlca: code: 0, state: 00000
9797
[NO_PID]: prepare_common on line 99: name stmt_2; query: "SELECT f1,f2,f3 FROM source"
9898
[NO_PID]: sqlca: code: 0, state: 00000
@@ -142,7 +142,7 @@
142142
[NO_PID]: sqlca: code: 0, state: 00000
143143
[NO_PID]: deallocate_one on line 111: name stmt_2
144144
[NO_PID]: sqlca: code: 0, state: 00000
145-
[NO_PID]: ECPGdeclare on line 122: declared name stmt_3 on connection: "con1"
145+
[NO_PID]: ECPGdeclare on line 122: declared name "stmt_3" on connection: "con1"
146146
[NO_PID]: sqlca: code: 0, state: 00000
147147
[NO_PID]: prepare_common on line 123: name stmt_3; query: "SELECT f1,f2,f3 FROM source"
148148
[NO_PID]: sqlca: code: 0, state: 00000
@@ -280,9 +280,9 @@
280280
[NO_PID]: sqlca: code: 0, state: 00000
281281
[NO_PID]: ecpg_finish: connection con2 closed
282282
[NO_PID]: sqlca: code: 0, state: 00000
283-
[NO_PID]: ecpg_release_declared_statement: declared name stmt_3 is released
283+
[NO_PID]: ecpg_release_declared_statement: declared name "stmt_3" is released
284284
[NO_PID]: sqlca: code: 0, state: 00000
285-
[NO_PID]: ecpg_release_declared_statement: declared name stmt_2 is released
285+
[NO_PID]: ecpg_release_declared_statement: declared name "stmt_2" is released
286286
[NO_PID]: sqlca: code: 0, state: 00000
287287
[NO_PID]: ecpg_finish: connection con1 closed
288288
[NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/libpq/fe-connect.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1264,9 +1264,9 @@ connectOptions2(PGconn *conn)
12641264
if (strcmp(conn->gssencmode, "require") == 0)
12651265
{
12661266
conn->status = CONNECTION_BAD;
1267-
printfPQExpBuffer(
1268-
&conn->errorMessage,
1269-
libpq_gettext("no GSSAPI support; cannot require GSSAPI\n"));
1267+
printfPQExpBuffer(&conn->errorMessage,
1268+
libpq_gettext("gssencmode value \"%s\" invalid when GSSAPI support is not compiled in\n"),
1269+
conn->gssencmode);
12701270
return false;
12711271
}
12721272
#endif
@@ -1675,7 +1675,7 @@ parse_int_param(const char *value, int *result, PGconn *conn,
16751675
}
16761676

16771677
appendPQExpBuffer(&conn->errorMessage,
1678-
libpq_gettext("invalid integer value \"%s\" for keyword \"%s\"\n"),
1678+
libpq_gettext("invalid integer value \"%s\" for connection option \"%s\"\n"),
16791679
value, context);
16801680
return false;
16811681
}
@@ -2774,7 +2774,7 @@ PQconnectPoll(PGconn *conn)
27742774
else if (!conn->gctx && conn->gssencmode[0] == 'r')
27752775
{
27762776
appendPQExpBufferStr(&conn->errorMessage,
2777-
libpq_gettext("GSSAPI encryption required, but was impossible (possibly no credential cache, no server support, or using a local socket)\n"));
2777+
libpq_gettext("GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)\n"));
27782778
goto error_return;
27792779
}
27802780
#endif

0 commit comments

Comments
 (0)