Skip to content

Commit 05ed7c8

Browse files
committed
bufferevent_pair: fix infer warnings due to upcast() return NULL
The only user that is care about this is bufferevent_pair_get_partner(), so let's move the check there.
1 parent 92ea847 commit 05ed7c8

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

bufferevent_pair.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ static inline struct bufferevent_pair *
5656
upcast(struct bufferevent *bev)
5757
{
5858
struct bufferevent_pair *bev_p;
59-
if (!BEV_IS_PAIR(bev))
60-
return NULL;
6159
bev_p = EVUTIL_UPCAST(bev, struct bufferevent_pair, bev.bev);
6260
EVUTIL_ASSERT(BEV_IS_PAIR(&bev_p->bev.bev));
6361
return bev_p;
@@ -341,10 +339,9 @@ bufferevent_pair_get_partner(struct bufferevent *bev)
341339
{
342340
struct bufferevent_pair *bev_p;
343341
struct bufferevent *partner = NULL;
344-
bev_p = upcast(bev);
345-
if (! bev_p)
342+
if (!BEV_IS_PAIR(bev))
346343
return NULL;
347-
344+
bev_p = upcast(bev);
348345
incref_and_lock(bev);
349346
if (bev_p->partner)
350347
partner = downcast(bev_p->partner);

0 commit comments

Comments
 (0)