svn commit: r279822 - vendor/illumos/dist/tools/ctf/cvt
Mark Johnston
markj at FreeBSD.org
Mon Mar 9 20:43:16 UTC 2015
Author: markj
Date: Mon Mar 9 20:43:14 2015
New Revision: 279822
URL: https://svnweb.freebsd.org/changeset/base/279822
Log:
5589 improper use of NULL in tools/ctf
Reviewed by: David Höppner <0xffea at gmail.com>
Reviewed by: Josef "Jeff" Sipek <jeffpc at josefsipek.net>
Approved by: Dan McDonald <danmcd at omniti.com>
Author: Richard PALO <richard at NetBSD.org>
illumos/illumos-gate at ad0b1ea5d69a45fe23c434277599e315f29a5fca
Modified:
vendor/illumos/dist/tools/ctf/cvt/ctf.c
vendor/illumos/dist/tools/ctf/cvt/dwarf.c
vendor/illumos/dist/tools/ctf/cvt/output.c
Modified: vendor/illumos/dist/tools/ctf/cvt/ctf.c
==============================================================================
--- vendor/illumos/dist/tools/ctf/cvt/ctf.c Mon Mar 9 20:29:16 2015 (r279821)
+++ vendor/illumos/dist/tools/ctf/cvt/ctf.c Mon Mar 9 20:43:14 2015 (r279822)
@@ -1216,7 +1216,7 @@ decompress_ctf(caddr_t cbuf, size_t cbuf
(rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END ||
(rc = inflateEnd(&zstr)) != Z_OK) {
warning("CTF decompress zlib error %s\n", zError(rc));
- return (NULL);
+ return (0);
}
debug(3, "reflated %lu bytes to %lu, pointer at %d\n",
Modified: vendor/illumos/dist/tools/ctf/cvt/dwarf.c
==============================================================================
--- vendor/illumos/dist/tools/ctf/cvt/dwarf.c Mon Mar 9 20:29:16 2015 (r279821)
+++ vendor/illumos/dist/tools/ctf/cvt/dwarf.c Mon Mar 9 20:43:14 2015 (r279822)
@@ -1714,7 +1714,7 @@ static const die_creator_t die_creators[
{ DW_TAG_variable, DW_F_NOTDP, die_variable_create },
{ DW_TAG_volatile_type, 0, die_volatile_create },
{ DW_TAG_restrict_type, 0, die_restrict_create },
- { 0, NULL }
+ { 0, 0, NULL }
};
static const die_creator_t *
Modified: vendor/illumos/dist/tools/ctf/cvt/output.c
==============================================================================
--- vendor/illumos/dist/tools/ctf/cvt/output.c Mon Mar 9 20:29:16 2015 (r279821)
+++ vendor/illumos/dist/tools/ctf/cvt/output.c Mon Mar 9 20:43:14 2015 (r279822)
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Routines for preparing tdata trees for conversion into CTF data, and
* for placing the resulting data into an output file.
@@ -466,7 +464,7 @@ write_file(Elf *src, const char *srcname
int pad;
int i;
- if (gelf_newehdr(dst, gelf_getclass(src)) == NULL)
+ if (gelf_newehdr(dst, gelf_getclass(src)) == 0)
elfterminate(dstname, "Cannot copy ehdr to temp file");
gelf_getehdr(src, &sehdr);
memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr));
@@ -482,7 +480,7 @@ write_file(Elf *src, const char *srcname
*/
if (sehdr.e_phnum != 0) {
(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT);
- if (gelf_newphdr(dst, sehdr.e_phnum) == NULL)
+ if (gelf_newphdr(dst, sehdr.e_phnum) == 0)
elfterminate(dstname, "Cannot make phdrs in temp file");
for (i = 0; i < sehdr.e_phnum; i++) {
@@ -616,7 +614,7 @@ write_file(Elf *src, const char *srcname
}
}
- if (gelf_update_shdr(dscn, &shdr) == NULL)
+ if (gelf_update_shdr(dscn, &shdr) == 0)
elfterminate(dstname, "Cannot update sect %s", sname);
new_offset = (off_t)shdr.sh_offset;
More information about the svn-src-all
mailing list