diff options
| author | Toomas Soome <tsoome@me.com> | 2019-04-27 21:07:56 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-05-15 23:14:46 +0300 |
| commit | fb46ffcae2cbe5ba3f2fe0c3104beb0a222897fd (patch) | |
| tree | 42e75c3e758943ae36c1143031db4ebe11243eb8 | |
| parent | ee3e45c0196a43379207b0298fcd21987a2ab05f (diff) | |
| download | illumos-joyent-fb46ffcae2cbe5ba3f2fe0c3104beb0a222897fd.tar.gz | |
10878 i86pc/i86xpv: comparison between pointer and integer
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/krtld/kobj.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/os/brand.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c index 62eaabfb03..b7fee8b36b 100644 --- a/usr/src/uts/common/krtld/kobj.c +++ b/usr/src/uts/common/krtld/kobj.c @@ -2718,7 +2718,7 @@ crypto_es_hash(struct module *mp, char *hash, char *shstrtab) " %s data size=%d\n", shstrtab + shp->sh_name, shp->sh_size); #endif - ASSERT(shp->sh_addr != NULL); + ASSERT(shp->sh_addr != 0); SHA1Update(&ctx, (const uint8_t *)shp->sh_addr, shp->sh_size); } diff --git a/usr/src/uts/common/os/brand.c b/usr/src/uts/common/os/brand.c index 773ecc9c6a..8b3177b916 100644 --- a/usr/src/uts/common/os/brand.c +++ b/usr/src/uts/common/os/brand.c @@ -718,8 +718,8 @@ brand_solaris_elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, } } /* Make sure the emulator has an entry point */ - ASSERT(sed.sed_entry != NULL); - ASSERT(sed.sed_phdr != NULL); + ASSERT(sed.sed_entry != 0); + ASSERT(sed.sed_phdr != 0); bzero(&env, sizeof (env)); if (args->to_model == DATAMODEL_NATIVE) { |