rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dead code in do_pg_backup_start(). 

As of commit 39969e2a1, no caller of do_pg_backup_start() passes NULL
for labelfile or tblspcmapfile, nor is it plausible that any would
do so in the future.  Remove the code that coped with that case,
as (a) it's dead and (b) it causes Coverity to bleat about possibly
leaked storage.

While here, do some janitorial work on the function's header comment.
This commit is contained in:
Tom Lane 2022-04-11 15:56:01 -04:00
parent 5e70d8b5d1
commit 9de692c101
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/access/transam/xlog.c
View File

@ -8037,23 +8037,26 @@ issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli)
* function. It creates the necessary starting checkpoint and constructs the * function. It creates the necessary starting checkpoint and constructs the
* backup label and tablespace map. * backup label and tablespace map.
* *
* The backup label and tablespace map contents are returned in *labelfile and * Input parameters are "backupidstr" (the backup label string) and "fast"
* (if true, we do the checkpoint in immediate mode to make it faster).
*
* The backup label and tablespace map contents are appended to *labelfile and
* *tblspcmapfile, and the caller is responsible for including them in the * *tblspcmapfile, and the caller is responsible for including them in the
* backup archive as 'backup_label' and 'tablespace_map'. There can be many * backup archive as 'backup_label' and 'tablespace_map'.
* backups active at the same time. * tblspcmapfile is required mainly for tar format in windows as native windows
* utilities are not able to create symlinks while extracting files from tar.
* However for consistency and platform-independence, we do it the same way
* everywhere.
* *
* If "tablespaces" isn't NULL, it receives a list of tablespaceinfo structs * If "tablespaces" isn't NULL, it receives a list of tablespaceinfo structs
* describing the cluster's tablespaces. * describing the cluster's tablespaces.
* *
* tblspcmapfile is required mainly for tar format in windows as native windows
* utilities are not able to create symlinks while extracting files from tar.
* However for consistency, the same is used for all platforms.
*
* Returns the minimum WAL location that must be present to restore from this * Returns the minimum WAL location that must be present to restore from this
* backup, and the corresponding timeline ID in *starttli_p. * backup, and the corresponding timeline ID in *starttli_p.
* *
* Every successfully started backup must be stopped by calling * Every successfully started backup must be stopped by calling
* do_pg_backup_stop() or do_pg_abort_backup(). * do_pg_backup_stop() or do_pg_abort_backup(). There can be many
* backups active at the same time.
* *
* It is the responsibility of the caller of this function to verify the * It is the responsibility of the caller of this function to verify the
* permissions of the calling user! * permissions of the calling user!
@ -8244,12 +8247,8 @@ do_pg_backup_start(const char *backupidstr, bool fast, TimeLineID *starttli_p,
XLogFileName(xlogfilename, starttli, _logSegNo, wal_segment_size); XLogFileName(xlogfilename, starttli, _logSegNo, wal_segment_size);
/* /*
* Construct tablespace_map file. If caller isn't interested in this, * Construct tablespace_map file.
* we make a local StringInfo.
*/ */
if (tblspcmapfile == NULL)
tblspcmapfile = makeStringInfo();
datadirpathlen = strlen(DataDir); datadirpathlen = strlen(DataDir);
/* Collect information about all tablespaces */ /* Collect information about all tablespaces */
@ -8350,11 +8349,8 @@ do_pg_backup_start(const char *backupidstr, bool fast, TimeLineID *starttli_p,
FreeDir(tblspcdir); FreeDir(tblspcdir);
/* /*
* Construct backup label file. If caller isn't interested in this, * Construct backup label file.
* we make a local StringInfo.
*/ */
if (labelfile == NULL)
labelfile = makeStringInfo();
/* Use the log timezone here, not the session timezone */ /* Use the log timezone here, not the session timezone */
stamp_time = (pg_time_t) time(NULL); stamp_time = (pg_time_t) time(NULL);