diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-08-10 18:51:31 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-08-10 23:20:37 +0200 |
| commit | 1784f278a63866cc144fcd0a2127cadba6a2b7f8 (patch) | |
| tree | ce0f644de0d3a89fc8b49ff67be8428731cb041b /src/backend/access/transam | |
| parent | cec57b1a0fbcd3833086ba686897c5883e0a2afc (diff) | |
| download | postgresql-1784f278a63866cc144fcd0a2127cadba6a2b7f8.tar.gz postgresql-1784f278a63866cc144fcd0a2127cadba6a2b7f8.zip | |
Replace remaining StrNCpy() by strlcpy()
They are equivalent, except that StrNCpy() zero-fills the entire
destination buffer instead of providing just one trailing zero. For
all but a tiny number of callers, that's just overhead rather than
being desirable.
Remove StrNCpy() as it is now unused.
In some cases, namestrcpy() is the more appropriate function to use.
While we're here, simplify the API of namestrcpy(): Remove the return
value, don't check for NULL input. Nothing was using that anyway.
Also, remove a few unused name-related functions.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/44f5e198-36f6-6cdb-7fa9-60e34784daae%402ndquadrant.com
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/slru.c | 2 | ||||
| -rw-r--r-- | src/backend/access/transam/xlogarchive.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 9e145f1c36a..d1dbb43e096 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -252,7 +252,7 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns, */ ctl->shared = shared; ctl->do_fsync = true; /* default behavior */ - StrNCpy(ctl->Dir, subdir, sizeof(ctl->Dir)); + strlcpy(ctl->Dir, subdir, sizeof(ctl->Dir)); } /* diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c index cdd586fcfba..8f8734dc1d4 100644 --- a/src/backend/access/transam/xlogarchive.c +++ b/src/backend/access/transam/xlogarchive.c @@ -323,7 +323,7 @@ ExecuteRecoveryCommand(const char *command, const char *commandName, bool failOn case 'r': /* %r: filename of last restartpoint */ sp++; - StrNCpy(dp, lastRestartPointFname, endp - dp); + strlcpy(dp, lastRestartPointFname, endp - dp); dp += strlen(dp); break; case '%': |