Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
This commit is contained in:
commit
049a26b800
|
@ -5452,7 +5452,8 @@ main(int argc, char **argv)
|
||||||
process_options(argc, argv);
|
process_options(argc, argv);
|
||||||
|
|
||||||
/* Override location of zpool.cache */
|
/* Override location of zpool.cache */
|
||||||
(void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir);
|
VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
|
||||||
|
zopt_dir) != -1);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Blow away any existing copy of zpool.cache
|
* Blow away any existing copy of zpool.cache
|
||||||
|
|
Loading…
Reference in New Issue