Merge pull request #1035 from tempesta-tech/ao-1013

Fix #1013: Avoid gcc-7 warning in conditional ternary operator (#1013).
tempesta-tech · Jul 5, 2018 · ca3d197 · ca3d197
2 parents 333ec1c + 70f47e0
commit ca3d197
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/tempesta_fw/http_limits.c b/tempesta_fw/http_limits.c
@@ -250,10 +250,9 @@ int prio0, prio1, prio3;
  */
 #define __FRANG_CFG_VAR(name, member)					\
 	const typeof(((FrangCfg *)0)->member) name =			\
-		(req->location						\
-		 ? (req->location->frang_cfg->member			\
-		    ? : tfw_vhost_global_frang_cfg()->member)		\
-		 : tfw_vhost_global_frang_cfg()->member)
+		(req->location && req->location->frang_cfg->member	\
+		? req->location->frang_cfg->member			\
+		: tfw_vhost_global_frang_cfg()->member)
 
 #define frang_msg(check, addr, fmt, ...)				\
 do {									\