RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 15:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream-int: make si_appctx() never fail

Browse Source 
Callers of si_appctx() always use the result without checking it because
they know by construction that it's valid. This results in unchecked null
pointer warnings at -Wextra, so let's remove this test and make it clear
that it's up to the caller to check validity first.
This commit is contained in:
Willy Tarreau 2018-09-20 11:08:47 +02:00
parent babc15e8cf
commit 4ae4923c3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/stream_interface.h
View File

@ -227,10 +227,10 @@ static inline void si_attach_appctx(struct stream_interface *si, struct appctx *
appctx->owner = si;
}
/* returns a pointer to the appctx being run in the SI or NULL if none */
/* returns a pointer to the appctx being run in the SI, which must be valid */
static inline struct appctx *si_appctx(struct stream_interface *si)
{
return objt_appctx(si->end);
return __objt_appctx(si->end);
}
/* call the applet's release function if any. Needs to be called upon close() */
@ -238,7 +238,7 @@ static inline void si_applet_release(struct stream_interface *si)
{
struct appctx *appctx;
appctx = si_appctx(si);
appctx = objt_appctx(si->end);
if (appctx && appctx->applet->release && si->state < SI_ST_DIS)
appctx->applet->release(appctx);
}