Date: Sat, 02 Feb 2019 19:47:33 +0200 From: "Andriy Voskoboinyk" <avos@freebsd.org> To: "Rodney W. Grimes" <freebsd@pdx.rh.cn85.dnsmgr.net>, rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r343682 - head/sys/dev/wtap Message-ID: <op.zwlidjhz4dikkl@localhost> In-Reply-To: <201902021730.x12HUrcO028481@pdx.rh.CN85.dnsmgr.net> References: <201902021730.x12HUrcO028481@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Sat, 02 Feb 2019 19:30:53 +0200 було написано Rodney W. Grimes <freebsd@pdx.rh.cn85.dnsmgr.net>: > [ Charset UTF-8 unsupported, converting... ] >> Author: avos >> Date: Sat Feb 2 16:15:46 2019 >> New Revision: 343682 >> URL: https://svnweb.freebsd.org/changeset/base/343682 >> >> Log: >> sys/dev/wtap: Check return value from malloc(..., M_NOWAIT) and >> drop unneeded cast. >> >> MFC after: 3 days >> >> Modified: >> head/sys/dev/wtap/if_wtap.c >> >> Modified: head/sys/dev/wtap/if_wtap.c >> ============================================================================== >> --- head/sys/dev/wtap/if_wtap.c Sat Feb 2 16:07:56 2019 (r343681) >> +++ head/sys/dev/wtap/if_wtap.c Sat Feb 2 16:15:46 2019 (r343682) >> @@ -373,7 +373,7 @@ wtap_vap_delete(struct ieee80211vap *vap) >> destroy_dev(avp->av_dev); >> callout_stop(&avp->av_swba); >> ieee80211_vap_detach(vap); >> - free((struct wtap_vap*) vap, M_80211_VAP); >> + free(avp, M_80211_VAP); >> } >> >> static void >> @@ -602,6 +602,8 @@ wtap_node_alloc(struct ieee80211vap *vap, const >> uint8_ >> >> ni = malloc(sizeof(struct ieee80211_node), M_80211_NODE, >> M_NOWAIT|M_ZERO); >> + if (ni == NULL) >> + return (NULL); >> >> ni->ni_txrate = 130; >> return ni; > > Um, this simplifies to and preserves single return: > > if (ni != NULL) > ni->ni_txrate = 130; > return ni; Yes, but code style for this function is just the same across all wireless drivers and ieee80211_node(4) man page; also, it clearly shows the main code path.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.zwlidjhz4dikkl>