diff options
| author | Toomas Soome <tsoome@me.com> | 2017-07-01 22:55:04 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-03-23 10:45:25 -0400 |
| commit | 243bebc0df1221801f517d667fdace1c1aeb94c1 (patch) | |
| tree | d6b7c5402539891cf38ccc02f9b5d57f94770c63 | |
| parent | 23274804946ea79b54ae682df4d33bbbb30b42ee (diff) | |
| download | illumos-joyent-243bebc0df1221801f517d667fdace1c1aeb94c1.tar.gz | |
9269 uts/i86pc: rootnex comparison between pointer and zero character constant
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/i86pc/io/immu.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/immu_dmar.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/io/immu.c b/usr/src/uts/i86pc/io/immu.c index 8bad3acd72..5c9f723e65 100644 --- a/usr/src/uts/i86pc/io/immu.c +++ b/usr/src/uts/i86pc/io/immu.c @@ -691,9 +691,9 @@ blacklisted_smbios(void) strptr = &black_array[i]; if (strcmp(*strptr++, "SMBIOS") == 0) { if (strcmp(*strptr++, mfg) == 0 && - ((char *)strptr == '\0' || + (*strptr[0] == '\0' || strcmp(*strptr++, product) == 0) && - ((char *)strptr == '\0' || + (*strptr[0] == '\0' || strcmp(*strptr++, version) == 0)) { return (B_TRUE); } diff --git a/usr/src/uts/i86pc/io/immu_dmar.c b/usr/src/uts/i86pc/io/immu_dmar.c index 7ebcfb0ba6..384f16e554 100644 --- a/usr/src/uts/i86pc/io/immu_dmar.c +++ b/usr/src/uts/i86pc/io/immu_dmar.c @@ -926,9 +926,9 @@ immu_dmar_blacklisted(char **strptr, uint_t nstrs) for (i = 0; nstrs - i >= 4; i++) { if (strcmp(*strptr++, "DMAR") == 0) { if (strcmp(*strptr++, tbl->tbl_oem_id) == 0 && - ((char *)strptr == '\0' || + (*strptr[0] == '\0' || strcmp(*strptr++, tbl->tbl_oem_tblid) == 0) && - ((char *)strptr == '\0' || + (*strptr[0] == '\0' || strcmp(*strptr++, oem_rev) == 0)) { return (B_TRUE); } |