From 4ae4923c3e44f8bd62bc9bd226389f373ace695e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 20 Sep 2018 11:08:47 +0200 Subject: [PATCH] MINOR: stream-int: make si_appctx() never fail 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. --- include/proto/stream_interface.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h index a9dca82538..74537b9764 100644 --- a/include/proto/stream_interface.h +++ b/include/proto/stream_interface.h @@ -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); } -- 2.47.3