database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-11 20:28:21 +03:00
Code Activity

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2011-08-14 21:03:08 +03:00
parent 280daac707
commit 00fc5d2263
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_archivecleanup/pg_archivecleanup.c
View File

@ -83,7 +83,7 @@ Initialize(void)
if (stat(archiveLocation, &stat_buf) != 0 || if (stat(archiveLocation, &stat_buf) != 0 ||
!S_ISDIR(stat_buf.st_mode)) !S_ISDIR(stat_buf.st_mode))
{ {
fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n", fprintf(stderr, "%s: archive location \"%s\" does not exist\n",
progname, archiveLocation); progname, archiveLocation);
exit(2); exit(2);
} }
@ -135,7 +135,7 @@ CleanupPriorWALFiles(void)
closedir(xldir); closedir(xldir);
} }
else else
fprintf(stderr, "%s: could not open archiveLocation \"%s\": %s\n", fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
progname, archiveLocation, strerror(errno)); progname, archiveLocation, strerror(errno));
} }

13
contrib/pg_standby/pg_standby.c
View File

@ -173,7 +173,7 @@ CustomizableInitialize(void)
*/ */
if (stat(archiveLocation, &stat_buf) != 0) if (stat(archiveLocation, &stat_buf) != 0)
{ {
fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n", progname, archiveLocation); fprintf(stderr, "%s: archive location \"%s\" does not exist\n", progname, archiveLocation);
fflush(stderr); fflush(stderr);
exit(2); exit(2);
} }
@ -283,12 +283,12 @@ CustomizableCleanupPriorWALFiles(void)
#endif #endif
if (debug) if (debug)
fprintf(stderr, "\nremoving \"%s\"", WALFilePath); fprintf(stderr, "\nremoving file \"%s\"", WALFilePath);
rc = unlink(WALFilePath); rc = unlink(WALFilePath);
if (rc != 0) if (rc != 0)
{ {
fprintf(stderr, "\n%s: ERROR failed to remove \"%s\": %s", fprintf(stderr, "\n%s: ERROR: could not remove file \"%s\": %s\n",
progname, WALFilePath, strerror(errno)); progname, WALFilePath, strerror(errno));
break; break;
} }
@ -298,7 +298,8 @@ CustomizableCleanupPriorWALFiles(void)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
else else
fprintf(stderr, "%s: archiveLocation \"%s\" open error\n", progname, archiveLocation); fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
progname, archiveLocation, strerror(errno));
closedir(xldir); closedir(xldir);
fflush(stderr); fflush(stderr);
@ -693,7 +694,7 @@ main(int argc, char **argv)
} }
else else
{ {
fprintf(stderr, "%s: use %%f to specify nextWALFileName\n", progname); fprintf(stderr, "%s: must specify WAL file name as second non-option argument (use \"%%f\")\n", progname);
fprintf(stderr, "Try \"%s --help\" for more information.\n", progname); fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
exit(2); exit(2);
} }
@ -705,7 +706,7 @@ main(int argc, char **argv)
} }
else else
{ {
fprintf(stderr, "%s: use %%p to specify xlogFilePath\n", progname); fprintf(stderr, "%s: must specify xlog destination as third non-option argument (use \"%%p\")\n", progname);
fprintf(stderr, "Try \"%s --help\" for more information.\n", progname); fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
exit(2); exit(2);
} }