Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jul 2015 23:44:37 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285781 - head/sys/cddl/dev/fbt
Message-ID:  <201507212344.t6LNibE3019491@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Tue Jul 21 23:44:36 2015
New Revision: 285781
URL: https://svnweb.freebsd.org/changeset/base/285781

Log:
  Remove checks for a NULL return value from M_WAITOK allocations.

Modified:
  head/sys/cddl/dev/fbt/fbt.c

Modified: head/sys/cddl/dev/fbt/fbt.c
==============================================================================
--- head/sys/cddl/dev/fbt/fbt.c	Tue Jul 21 23:42:56 2015	(r285780)
+++ head/sys/cddl/dev/fbt/fbt.c	Tue Jul 21 23:44:36 2015	(r285781)
@@ -334,9 +334,7 @@ fbt_ctfoff_init(modctl_t *lf, linker_ctf
 		return (EINVAL);
 	}
 
-	if ((ctfoff = malloc(sizeof(uint32_t) * lc->nsym, M_LINKER, M_WAITOK)) == NULL)
-		return (ENOMEM);
-
+	ctfoff = malloc(sizeof(uint32_t) * lc->nsym, M_LINKER, M_WAITOK);
 	*lc->ctfoffp = ctfoff;
 
 	for (i = 0; i < lc->nsym; i++, ctfoff++, symp++) {
@@ -515,8 +513,8 @@ fbt_typoff_init(linker_ctf_t *lc)
 	ctf_typemax++;
 	*lc->typlenp = ctf_typemax;
 
-	if ((xp = malloc(sizeof(uint32_t) * ctf_typemax, M_LINKER, M_ZERO | M_WAITOK)) == NULL)
-		return (ENOMEM);
+	xp = malloc(sizeof(uint32_t) * ctf_typemax, M_LINKER,
+	    M_ZERO | M_WAITOK);
 
 	*lc->typoffp = xp;
 
@@ -838,11 +836,7 @@ ctf_decl_push(ctf_decl_t *cd, linker_ctf
 		prec = CTF_PREC_BASE;
 	}
 
-	if ((cdp = malloc(sizeof (ctf_decl_node_t), M_FBT, M_WAITOK)) == NULL) {
-		cd->cd_err = EAGAIN;
-		return;
-	}
-
+	cdp = malloc(sizeof(*cdp), M_FBT, M_WAITOK);
 	cdp->cd_type = type;
 	cdp->cd_kind = kind;
 	cdp->cd_n = n;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507212344.t6LNibE3019491>