summaryrefslogtreecommitdiff
path: root/usr/src/lib/libtsol/common/getpathbylabel.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-06-25 13:52:16 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-06-25 13:52:16 +0000
commitd152c784e9ec5ececac97129ea92fe6afc57078c (patch)
tree79232acc096ef9414315de612d4587007b1606d5 /usr/src/lib/libtsol/common/getpathbylabel.c
parent394dadbc86535e5075b260851683ccbb3f571c6d (diff)
parent07eb1aef88b873c5c1036d9cf69820c1ef6a32fb (diff)
downloadillumos-joyent-d152c784e9ec5ececac97129ea92fe6afc57078c.tar.gz
[illumos-gate merge]
commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb 11151 libpkcs11: NULL pointer errors commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9 11150 libdladm: NULL pointer errors commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c 11208 add mdb format character for jazzed-up binary output 11206 mdb output autowrapping still subtly wrong 11207 many 64-bit mdb format characters have insufficient width commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6 10936 umem_genasm needs to be stricter about segments 10937 Clean up umem smatch and cerrwarn commit 3c308cd1a430039e3b6327544d02ab1a5384066a 11259 mandoc should allow ERRORS section in all man section 7 variants commit 3970c09844d4f5e54234620de153ab71a05afbca 11149 libpkg: NULL pointer errors commit f00128d8e2d39a5be61357047531dc79fde48623 11134 libdevinfo: NULL pointer errors commit 4a014300cea3d870431d7e52aff6781d3c63e5d1 11143 libscf: NULL pointer errors commit d60ff33691519a9505afc8818735139f4dfd0c31 11141 libdtrace: NULL pointer errors commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9 11139 libcpc: NULL pointer errors commit ce67cb245e522293fca567799070a5cdd4267929 11131 libtsol: NULL pointer errors commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb 11127 libsip: NULL pointer errors commit f21450b8fa7a1530d48dc06401e691df1b8965fa 11121 libadm: NULL pointer errors commit 5f060f5100426465bddc18c6f81b146ccee30eb8 11120 libpcidb: NULL pointer errors commit 22ca2f96318fd461cfbcc23fd450623fe08610a3 11109 librtld_db: NULL pointer errors commit 6888a8ba15f151decee7821a09e34fed2fb63513 11107 mcs: NULL pointer errors commit 9320f4959b6c72e7a6d056623827091cace259ee 11106 elfedit: NULL pointer errors commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8 11101 libld: NULL pointer errors Conflicts: usr/src/lib/libumem/amd64/umem_genasm.c
Diffstat (limited to 'usr/src/lib/libtsol/common/getpathbylabel.c')
-rw-r--r--usr/src/lib/libtsol/common/getpathbylabel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/lib/libtsol/common/getpathbylabel.c b/usr/src/lib/libtsol/common/getpathbylabel.c
index 069ce0a6c6..22a0da1329 100644
--- a/usr/src/lib/libtsol/common/getpathbylabel.c
+++ b/usr/src/lib/libtsol/common/getpathbylabel.c
@@ -23,9 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-
/*
* Name: getpathbylabel.c
*
@@ -182,7 +179,7 @@ tsol_mkmntlist(void)
return (NULL);
}
resetmnttab(mounted);
- while (getmntent(mounted, &mnt) == NULL) {
+ while (getmntent(mounted, &mnt) == 0) {
mntl = (struct mntlist *)malloc(sizeof (*mntl));
if (mntl == NULL) {
tsol_mlist_free(mntst);