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

Commit5d0109b

Browse files
committed
Message style improvements
1 parente8d029a commit5d0109b

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

‎src/bin/initdb/initdb.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo)
24932493
processInfo))
24942494

24952495
{
2496-
fprintf(stderr,_("%s: could not start process for \"%s\": error code %lu\n"),progname,cmd,GetLastError());
2496+
fprintf(stderr,_("%s: could not start process forcommand\"%s\": error code %lu\n"),progname,cmd,GetLastError());
24972497
return0;
24982498
}
24992499

@@ -2838,7 +2838,7 @@ main(int argc, char *argv[])
28382838

28392839
if (!CreateRestrictedProcess(cmdline,&pi))
28402840
{
2841-
fprintf(stderr,_("%s: could not re-exec with restricted token: error code %lu\n"),progname,GetLastError());
2841+
fprintf(stderr,_("%s: could not re-execute with restricted token: error code %lu\n"),progname,GetLastError());
28422842
}
28432843
else
28442844
{

‎src/bin/pg_ctl/pg_ctl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1926,7 +1926,7 @@ adjust_data_dir(void)
19261926
fd=popen(cmd,"r");
19271927
if (fd==NULL||fgets(filename,sizeof(filename),fd)==NULL)
19281928
{
1929-
write_stderr(_("%s:cannot findthe data directory using %s\n"),progname,my_exec_path);
1929+
write_stderr(_("%s:could not determinethe data directory using\"%s\"\n"),progname,cmd);
19301930
exit(1);
19311931
}
19321932
pclose(fd);

‎src/bin/pg_dump/compress_io.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ ParseCompressionOption(int compression, CompressionAlgorithm *alg, int *level)
110110
*alg=COMPR_ALG_NONE;
111111
else
112112
{
113-
exit_horribly(modulename,"Invalid compression code: %d\n",
113+
exit_horribly(modulename,"invalid compression code: %d\n",
114114
compression);
115115
*alg=COMPR_ALG_NONE;/* keep compiler quiet */
116116
}

‎src/bin/pg_dump/dumputils.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ set_dump_section(const char *arg, int *dumpSections)
12601260
*dumpSections |=DUMP_POST_DATA;
12611261
else
12621262
{
1263-
fprintf(stderr,_("%s:unknown section name \"%s\")\n"),
1263+
fprintf(stderr,_("%s:unrecognized section name: \"%s\"\n"),
12641264
progname,arg);
12651265
fprintf(stderr,_("Try \"%s --help\" for more information.\n"),
12661266
progname);

‎src/bin/pg_dump/pg_backup_directory.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
407407
charpath[MAXPGPATH];
408408

409409
if (sscanf(line,"%u %s\n",&oid,fname)!=2)
410-
exit_horribly(modulename,"invalid line in large object TOC file: %s\n",
411-
line);
410+
exit_horribly(modulename,"invalid line in large object TOC file \"%s\": \"%s\"\n",
411+
fname,line);
412412

413413
StartRestoreBlob(AH,oid,ropt->dropSchema);
414414
snprintf(path,MAXPGPATH,"%s/%s",ctx->directory,fname);
@@ -667,7 +667,7 @@ prependDirectory(ArchiveHandle *AH, const char *relativeFilename)
667667
dname=ctx->directory;
668668

669669
if (strlen(dname)+1+strlen(relativeFilename)+1>MAXPGPATH)
670-
exit_horribly(modulename,"path name too long:%s",dname);
670+
exit_horribly(modulename,"file name too long:\"%s\"",dname);
671671

672672
strcpy(buf,dname);
673673
strcat(buf,"/");

‎src/bin/pg_dump/pg_dump_sort.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ repairDependencyLoop(DumpableObject **loop,
993993
write_msg(NULL,"NOTICE: there are circular foreign-key constraints among these table(s):\n");
994994
for (i=0;i<nLoop;i++)
995995
write_msg(NULL," %s\n",loop[i]->name);
996-
write_msg(NULL,"Youmay not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");
996+
write_msg(NULL,"Youmight not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");
997997
write_msg(NULL,"Consider using a full dump instead of a --data-only dump to avoid this problem.\n");
998998
if (nLoop>1)
999999
removeObjectDependency(loop[0],loop[1]->dumpId);

‎src/bin/pg_resetxlog/pg_resetxlog.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ PrintControlValues(bool guessed)
570570
sysident_str);
571571
printf(_("Latest checkpoint's TimeLineID: %u\n"),
572572
ControlFile.checkPointCopy.ThisTimeLineID);
573-
printf(_("Latest checkpoint's full_page_writes:%s\n"),
573+
printf(_("Latest checkpoint's full_page_writes: %s\n"),
574574
ControlFile.checkPointCopy.fullPageWrites ?_("on") :_("off"));
575575
printf(_("Latest checkpoint's NextXID: %u/%u\n"),
576576
ControlFile.checkPointCopy.nextXidEpoch,

‎src/bin/psql/command.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ exec_command(const char *cmd,
11141114
}
11151115
elseif (strchr(envvar,'=')!=NULL)
11161116
{
1117-
psql_error("\\%s: environment variable name must not contain'='\n",
1117+
psql_error("\\%s: environment variable name must not contain\"=\"\n",
11181118
cmd);
11191119
success= false;
11201120
}

0 commit comments

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