diff options
| author | Jorgen Lundman <[email protected]> | 2021-07-08 12:08:13 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-07 21:08:13 -0600 |
| commit | d2119d0e6f411be5418f88fdb9b64e5c7b808fce (patch) | |
| tree | 86e3d29dca27cf482d8f62a1dc4cffd25561a9bb /lib/libzfs/libzfs_pool.c | |
| parent | eb5983e1b7b46f9159f9efc76f2a59e3dd3a21c2 (diff) | |
Replace strchrnul() with strrchr()
Could have gone either way with this one, either adding it to
macOS/Windows SPL, or returning it to "classic" usage with strrchr().
Since the new special way isn't really used, and only used once,
we have this commit.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Jorgen Lundman <[email protected]>
Closes #12312
Diffstat (limited to 'lib/libzfs/libzfs_pool.c')
| -rw-r--r-- | lib/libzfs/libzfs_pool.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index c0bf9d067..7338b9d72 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -4871,7 +4871,9 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report, line != NULL; line = strtok_r(NULL, "\n", &ls)) { /* discard comments */ - *(strchrnul(line, '#')) = '\0'; + char *r = strchr(line, '#'); + if (r != NULL) + *r = '\0'; for (word = strtok_r(line, ", \t", &ws); word != NULL; |