summaryrefslogtreecommitdiff
path: root/usr/src/lib/libctf
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-02-13 12:46:41 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-02-13 12:46:41 +0000
commitcf607e7adae64e868ad748f0bf9f44ff02495aec (patch)
tree38054df221ef3a2149d936258b72222e60d7d302 /usr/src/lib/libctf
parent7d8f5232eba76666c623d07e4ae4401c00f43570 (diff)
parentc78b1a4529122c8f26c5b25b88f01dc4800751a0 (diff)
downloadillumos-joyent-cf607e7adae64e868ad748f0bf9f44ff02495aec.tar.gz
[illumos-gate merge]
commit cbc8e155c29643fa0d62159c2d3dee078ed6cc91 10355 uts: new-font project. Use terminus Unicode fonts for console. commit c9aaca5d3825256aa6c09cc34e4ce5640630341b 10403 consfonts: update to terminus-font-4.47 commit 2d106d6b0c1dcb62c2b9842419c54acabdc3ca0f 10401 loader: biosvbe_get_mode is using wrong mask with ebx register commit d1c9087b969ca22e13154e77ea4147ad672bc63b 10136 smatch fix for policykit commit 2756274fa95226a2638604ba310268a09e4f4744 10143 smatch fix for ttymon commit e83359656fe4880d77df4da075573820c2a7adc0 10393 ctf: NULL pointer errors commit b83d2fbf46ff51c4409d2bf8ed4c483ef21f456f 10394 SPARC qemu panic in the fd module
Diffstat (limited to 'usr/src/lib/libctf')
-rw-r--r--usr/src/lib/libctf/common/ctf_elfwrite.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/libctf/common/ctf_elfwrite.c b/usr/src/lib/libctf/common/ctf_elfwrite.c
index 7f668fe528..dfefbf6861 100644
--- a/usr/src/lib/libctf/common/ctf_elfwrite.c
+++ b/usr/src/lib/libctf/common/ctf_elfwrite.c
@@ -68,7 +68,7 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags)
goto out;
}
- if (gelf_newehdr(dst, gelf_getclass(src)) == NULL) {
+ if (gelf_newehdr(dst, gelf_getclass(src)) == 0) {
ret = ctf_set_errno(fp, ECTF_ELF);
goto out;
}
@@ -108,7 +108,7 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags)
*/
if (nphdr != 0) {
(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT);
- if (gelf_newphdr(dst, nphdr) == NULL) {
+ if (gelf_newphdr(dst, nphdr) == 0) {
ret = ctf_set_errno(fp, ECTF_ELF);
goto out;
}
@@ -266,7 +266,7 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags)
}
}
- if (gelf_update_shdr(dscn, &shdr) == NULL) {
+ if (gelf_update_shdr(dscn, &shdr) == 0) {
ret = ctf_set_errno(fp, ECTF_ELF);
goto out;
}
@@ -351,7 +351,7 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags)
dehdr.e_shstrndx = SHN_XINDEX;
else
dehdr.e_shstrndx = secxlate[sehdr.e_shstrndx];
- if (gelf_update_ehdr(dst, &dehdr) == NULL) {
+ if (gelf_update_ehdr(dst, &dehdr) == 0) {
ret = ctf_set_errno(fp, ECTF_ELF);
goto out;
}