Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes  #12312
This commit is contained in:
Jorgen Lundman 2021-07-08 12:08:13 +09:00 committed by Tony Hutter
parent c84670950a
commit a0b4da2297
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzfs/libzfs_pool.c
View File

@ -4871,7 +4871,9 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report,
line != NULL; line != NULL;
line = strtok_r(NULL, "\n", &ls)) { line = strtok_r(NULL, "\n", &ls)) {
/* discard comments */ /* discard comments */
*(strchrnul(line, '#')) = '\0'; char *r = strchr(line, '#');
if (r != NULL)
*r = '\0';
for (word = strtok_r(line, ", \t", &ws); for (word = strtok_r(line, ", \t", &ws);
word != NULL; word != NULL;