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

Commit12c1552

Browse files
committed
Mark many strings in backend not covered by elog for translation. Also,
make strings in xlog.c look more like English and less like binary noise.
1 parent277a47a commit12c1552

File tree

8 files changed

+1792
-1729
lines changed

8 files changed

+1792
-1729
lines changed

‎src/backend/access/transam/xlog.c‎

Lines changed: 136 additions & 99 deletions
Large diffs are not rendered by default.

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.107 2001/05/12 01:48:49 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.108 2001/06/03 14:53:56 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -185,11 +185,13 @@ err_out(void)
185185
staticvoid
186186
usage(void)
187187
{
188-
fprintf(stderr,"Usage:\n postgres -boot [-d] [-D datadir] [-F] [-x num] dbname\n");
189-
fprintf(stderr," -d debug mode\n");
190-
fprintf(stderr," -D datadir data directory\n");
191-
fprintf(stderr," -F turn off fsync\n");
192-
fprintf(stderr," -x num internal use\n");
188+
fprintf(stderr,
189+
gettext("Usage:\n"
190+
" postgres -boot [-d] [-D datadir] [-F] [-x num] dbname\n"
191+
" -d debug mode\n"
192+
" -D datadir data directory\n"
193+
" -F turn off fsync\n"
194+
" -x num internal use\n"));
193195

194196
proc_exit(1);
195197
}
@@ -286,10 +288,11 @@ BootstrapMain(int argc, char *argv[])
286288
{
287289
if (!potential_DataDir)
288290
{
289-
fprintf(stderr,"%s does not know where to find the database system "
290-
"data. You must specify the directory that contains the "
291-
"database system either by specifying the -D invocation "
292-
"option or by setting the PGDATA environment variable.\n\n",
291+
fprintf(stderr,
292+
gettext("%s does not know where to find the database system data.\n"
293+
"You must specify the directory that contains the database system\n"
294+
"either by specifying the -D invocation option or by setting the\n"
295+
"PGDATA environment variable.\n\n"),
293296
argv[0]);
294297
proc_exit(1);
295298
}

‎src/backend/main/main.c‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.44 2001/06/02 18:25:17 petere Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.45 2001/06/03 14:53:56 petere Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -41,12 +41,6 @@
4141
#include"tcop/tcopprot.h"
4242

4343

44-
#defineNOROOTEXEC "\
45-
\n\"root\" execution of the PostgreSQL server is not permitted.\n\n\
46-
The server must be started under an unprivileged userid to prevent\n\
47-
a possible system security compromise. See the INSTALL file for\n\
48-
more information on how to properly start the server.\n\n"
49-
5044

5145
int
5246
main(intargc,char*argv[])
@@ -87,7 +81,7 @@ main(int argc, char *argv[])
8781
#if defined(__alpha)
8882
if (setsysinfo(SSI_NVPAIRS,buffer,1, (caddr_t)NULL,
8983
(unsigned long)NULL)<0)
90-
fprintf(stderr,"setsysinfo failed: %d\n",errno);
84+
fprintf(stderr,gettext("%s:setsysinfo failed: %s\n"),argv[0],strerror(errno));
9185
#endif
9286

9387
#endif/* NOFIXADE || NOPRINTADE */
@@ -129,7 +123,12 @@ main(int argc, char *argv[])
129123
#ifndef__BEOS__
130124
if (geteuid()==0)
131125
{
132-
fprintf(stderr,"%s",NOROOTEXEC);
126+
fprintf(stderr,gettext(
127+
"\"root\" execution of the PostgreSQL server is not permitted.\n\n"
128+
"The server must be started under an unprivileged user id to prevent\n"
129+
"a possible system security compromise. See the documentation for\n"
130+
"more information on how to properly start the server.\n\n"
131+
));
133132
exit(1);
134133
}
135134
#endif/* __BEOS__ */
@@ -145,7 +144,7 @@ main(int argc, char *argv[])
145144
*/
146145
if (getuid()!=geteuid())
147146
{
148-
fprintf(stderr,"%s: real and effectiveuseridsmust match\n",
147+
fprintf(stderr,gettext("%s: real and effectiveuser idsmust match\n"),
149148
argv[0]);
150149
exit(1);
151150
}
@@ -194,7 +193,7 @@ main(int argc, char *argv[])
194193
pw=getpwuid(geteuid());
195194
if (pw==NULL)
196195
{
197-
fprintf(stderr,"%s: invalid current euid %d\n",
196+
fprintf(stderr,gettext("%s: invalid current euid %d\n"),
198197
argv[0], (int)geteuid());
199198
exit(1);
200199
}

‎src/backend/optimizer/geqo/geqo_main.c‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: geqo_main.c,v 1.27 2001/03/22 03:59:33 momjian Exp $
10+
* $Id: geqo_main.c,v 1.28 2001/06/03 14:53:56 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -217,24 +217,22 @@ geqo(Query *root, int number_of_rels, List *initial_rels)
217217

218218
#if defined(ERX)&& defined(GEQO_DEBUG)
219219
if (edge_failures!=0)
220-
fprintf(stdout,"\nFailures: %d Avg: %d\n",edge_failures, (int)generation /edge_failures);
221-
220+
elog(DEBUG,"[GEQO] failures: %d, average: %d",
221+
edge_failures, (int)generation /edge_failures);
222222
else
223-
fprintf(stdout,"No edge failures detected.\n");
223+
elog(DEBUG,"[GEQO]No edge failures detected.");
224224
#endif
225225

226226

227227
#if defined(CX)&& defined(GEQO_DEBUG)
228228
if (mutations!=0)
229-
fprintf(stdout,"\nMutations: %d Generations: %d\n",mutations,generation);
230-
229+
elog(DEBUG,"[GEQO] mutations: %d, generations: %d",mutations,generation);
231230
else
232-
fprintf(stdout,"No mutations processed.\n");
231+
elog(DEBUG,"[GEQO]No mutations processed.");
233232
#endif
234233

235234

236235
#ifdefGEQO_DEBUG
237-
fprintf(stdout,"\n");
238236
print_pool(stdout,pool,0,pool_size-1);
239237
#endif
240238

0 commit comments

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