https://bz.apache.org/bugzilla/show_bug.cgi?id=58855

Optimize check for empty strings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_authnz_fcgi.c b/modules/aaa/mod_authnz_fcgi.c
index a73bad61df80404bac04cfec8f37d323708634b0..b32d8a37d48df83123c3e361bf88360fb0b87ee6 100644 (file)
--- a/modules/aaa/mod_authnz_fcgi.c
+++ b/modules/aaa/mod_authnz_fcgi.c
@@ -855,7 +855,7 @@ static int fcgi_check_authn(request_rec *r)
             const char *err;
             const char *user = ap_expr_str_exec(r, dconf->user_expr,
                                                 &err);
-            if (user && strlen(user)) {
+            if (user && *user) {
                 r->user = apr_pstrdup(r->pool, user);
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               APLOGNO(02519) "%s: Setting user to '%s'",

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index d9212f228877711b56c52749d7229ed40fcd7be1..f8b93a0ec2589da94081e510261ceede4d05b50b 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -748,13 +748,13 @@ static authz_status ldapuser_check_authorization(request_rec *r,
      */
 
 
-    if (!strlen(r->user)) {
+    if (!*r->user) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699)
             "ldap authorize: Userid is blank, AuthType=%s",
             r->ap_auth_type);
     }
 
-    if (req->dn == NULL || strlen(req->dn) == 0) {
+    if (req->dn == NULL || !*req->dn) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702)
                       "auth_ldap authorize: require user: user's DN has not "
                       "been defined; failing authorization");
@@ -910,7 +910,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
      * and populated with the userid and DN of the account in LDAP
      */
 
-    if (!strlen(r->user)) {
+    if (!*r->user) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709)
             "ldap authorize: Userid is blank, AuthType=%s",
             r->ap_auth_type);
@@ -920,7 +920,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
     ent = (struct mod_auth_ldap_groupattr_entry_t *) sec->groupattr->elts;
 
     if (sec->group_attrib_is_dn) {
-        if (req->dn == NULL || strlen(req->dn) == 0) {
+        if (req->dn == NULL || !*req->dn) {
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712)
                           "auth_ldap authorize: require group: user's DN has "
                           "not been defined; failing authorization for user %s",
@@ -929,7 +929,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
         }
     }
     else {
-        if (req->user == NULL || strlen(req->user) == 0) {
+        if (req->user == NULL || !*req->user) {
             /* We weren't called in the authentication phase, so we didn't have a
              * chance to set the user field. Do so now. */
             req->user = r->user;
@@ -1063,7 +1063,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
      * and populated with the userid and DN of the account in LDAP
      */
 
-    if (!strlen(r->user)) {
+    if (!*r->user) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722)
             "ldap authorize: Userid is blank, AuthType=%s",
             r->ap_auth_type);
@@ -1091,7 +1091,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
 
     t = require;
 
-    if (req->dn == NULL || strlen(req->dn) == 0) {
+    if (req->dn == NULL || !*req->dn) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725)
                       "auth_ldap authorize: require dn: user's DN has not "
                       "been defined; failing authorization");
@@ -1163,7 +1163,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
      * and populated with the userid and DN of the account in LDAP
      */
 
-    if (!strlen(r->user)) {
+    if (!*r->user) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730)
             "ldap authorize: Userid is blank, AuthType=%s",
             r->ap_auth_type);
@@ -1181,7 +1181,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
         ldc = get_connection_for_authz(r, LDAP_COMPARE);
     }
 
-    if (req->dn == NULL || strlen(req->dn) == 0) {
+    if (req->dn == NULL || !*req->dn) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733)
                       "auth_ldap authorize: require ldap-attribute: user's DN "
                       "has not been defined; failing authorization");
@@ -1272,7 +1272,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
      * and populated with the userid and DN of the account in LDAP
      */
 
-    if (!strlen(r->user)) {
+    if (!*r->user) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739)
             "ldap authorize: Userid is blank, AuthType=%s",
             r->ap_auth_type);
@@ -1290,7 +1290,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
         ldc = get_connection_for_authz(r, LDAP_SEARCH);
     }
 
-    if (req->dn == NULL || strlen(req->dn) == 0) {
+    if (req->dn == NULL || !*req->dn) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742)
                       "auth_ldap authorize: require ldap-filter: user's DN "
                       "has not been defined; failing authorization");

diff --git a/modules/http2/h2_config.c b/modules/http2/h2_config.c
index 669d20e75ce0d827d4ea8e25a90df27509556943..3ac969d76896ca9fd7b7214e8fc74d0dfdb3d3f0 100644 (file)
--- a/modules/http2/h2_config.c
+++ b/modules/http2/h2_config.c
@@ -309,7 +309,7 @@ static const char *h2_conf_set_stream_max_mem_size(cmd_parms *parms,
 static const char *h2_add_alt_svc(cmd_parms *parms,
                                   void *arg, const char *value)
 {
-    if (value && strlen(value)) {
+    if (value && *value) {
         h2_config *cfg = (h2_config *)h2_config_sget(parms->server);
         h2_alt_svc *as = h2_alt_svc_parse(value, parms->pool);
         if (!as) {
@@ -407,7 +407,7 @@ static const char *h2_conf_add_push_priority(cmd_parms *cmd, void *_cfg,
     h2_priority *priority;
     int weight;
     
-    if (!strlen(ctype)) {
+    if (!*ctype) {
         return "1st argument must be a mime-type, like 'text/css' or '*'";
     }
     

diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c
index 4a0cc9767b47909d1dfd70fcfb1e503919efc367..6e1e7f4a9183242929a6df34003b42106b8ad6cc 100644 (file)
--- a/modules/ldap/util_ldap_cache_mgr.c
+++ b/modules/ldap/util_ldap_cache_mgr.c
@@ -674,7 +674,7 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st)
         return NULL;
     }
 
-    if (r->args && strlen(r->args)) {
+    if (r->args && *r->args) {
         char cachetype[5], lint[2];
         unsigned int id, off;
         char date_str[APR_CTIME_LEN];

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index ebf36753436b460e1d273f52ef9c067811b5f444..6f9201d609b2371ecf233e18a87c78eb50dd49e2 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -377,7 +377,7 @@ static const char *log_remote_user(request_rec *r, char *a)
     if (rvalue == NULL) {
         rvalue = "-";
     }
-    else if (strlen(rvalue) == 0) {
+    else if (!*rvalue) {
         rvalue = "\"\"";
     }
     else {

diff --git a/modules/lua/lua_dbd.c b/modules/lua/lua_dbd.c
index 8b61a60b10752d9501cff86d8a5d9ff067ee2928..1b8d5b7764d17606c34ec5e2c22ba92aa2ae18ce 100644 (file)
--- a/modules/lua/lua_dbd.c
+++ b/modules/lua/lua_dbd.c
@@ -782,7 +782,7 @@ int lua_db_acquire(lua_State *L)
                 arguments = lua_tostring(L, 3);
                 lua_settop(L, 0);
                 
-                if (strlen(arguments)) {
+                if (*arguments) {
                     rc = apr_dbd_open_ex(dbdhandle->driver, pool, 
                             arguments, &dbdhandle->handle, &error);
                     if (rc == APR_SUCCESS) {

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index d56bfd41bc9f9aa8d70db20fbcefa71ffb83a1d1..1f3d18d6876e9f681b01ef74614ffb4a5daee9bc 100644 (file)
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -382,7 +382,7 @@ static int req_parsebody(lua_State *L)
             sscanf(start + len + 2,
                 "Content-Disposition: form-data; name=\"%255[^\"]\"; filename=\"%255[^\"]\"",
                 key, filename);
-            if (strlen(key)) {
+            if (*key) {
                 req_aprtable2luatable_cb_len(L, key, buffer, vlen);
             }
         }
@@ -2110,8 +2110,8 @@ static int lua_set_cookie(lua_State *L)
             secure ? "Secure;" : "", 
             expires ? strexpires : "", 
             httponly ? "HttpOnly;" : "", 
-            strlen(strdomain) ? strdomain : "", 
-            strlen(strpath) ? strpath : "");
+            *strdomain ? strdomain : "", 
+            *strpath ? strpath : "");
     
     apr_table_add(r->err_headers_out, "Set-Cookie", out);
     return 0;

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 994208c17e39a2536a59aace481a04175f30bb83..12913533bd6101dcdddf9149cf3e52504b9d9035 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1100,13 +1100,13 @@ static int balancer_handler(request_rec *r)
             }
         }
         if ((val = apr_table_get(params, "w_wr"))) {
-            if (strlen(val) && strlen(val) < sizeof(wsel->s->route))
+            if (*val && strlen(val) < sizeof(wsel->s->route))
                 strcpy(wsel->s->route, val);
             else
                 *wsel->s->route = '\0';
         }
         if ((val = apr_table_get(params, "w_rr"))) {
-            if (strlen(val) && strlen(val) < sizeof(wsel->s->redirect))
+            if (*val && strlen(val) < sizeof(wsel->s->redirect))
                 strcpy(wsel->s->redirect, val);
             else
                 *wsel->s->redirect = '\0';
@@ -1165,13 +1165,13 @@ static int balancer_handler(request_rec *r)
             }
         }
         if ((val = apr_table_get(params, "w_hu"))) {
-            if (strlen(val) && strlen(val) < sizeof(wsel->s->hcuri))
+            if (*val && strlen(val) < sizeof(wsel->s->hcuri))
                 strcpy(wsel->s->hcuri, val);
             else
                 *wsel->s->hcuri = '\0';
         }
         if (hc_valid_expr_f && (val = apr_table_get(params, "w_he"))) {
-            if (strlen(val) && hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr))
+            if (*val && hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr))
                 strcpy(wsel->s->hcexpr, val);
             else
                 *wsel->s->hcexpr = '\0';