httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1703415 - in /httpd/test/framework/trunk/c-modules: authany/mod_authany.c test_session/mod_test_session.c
Date Wed, 16 Sep 2015 14:18:50 GMT
Author: jim
Date: Wed Sep 16 14:18:49 2015
New Revision: 1703415

URL: http://svn.apache.org/r1703415
Log:
silence warnings (which cause build to fail w/ maintainer-mode)

Modified:
    httpd/test/framework/trunk/c-modules/authany/mod_authany.c
    httpd/test/framework/trunk/c-modules/test_session/mod_test_session.c

Modified: httpd/test/framework/trunk/c-modules/authany/mod_authany.c
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/c-modules/authany/mod_authany.c?rev=1703415&r1=1703414&r2=1703415&view=diff
==============================================================================
--- httpd/test/framework/trunk/c-modules/authany/mod_authany.c (original)
+++ httpd/test/framework/trunk/c-modules/authany/mod_authany.c Wed Sep 16 14:18:49 2015
@@ -37,7 +37,8 @@ static const authn_provider authn_any_pr
 };
 
 static authz_status any_check_authorization(request_rec *r,
-                                            const char *requirement)
+                                            const char *requirement,
+                                            const void *dummy)
 {
 #if AP_MODULE_MAGIC_AT_LEAST(20100714,0)
     if (!r->user)

Modified: httpd/test/framework/trunk/c-modules/test_session/mod_test_session.c
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/c-modules/test_session/mod_test_session.c?rev=1703415&r1=1703414&r2=1703415&view=diff
==============================================================================
--- httpd/test/framework/trunk/c-modules/test_session/mod_test_session.c (original)
+++ httpd/test/framework/trunk/c-modules/test_session/mod_test_session.c Wed Sep 16 14:18:49
2015
@@ -149,7 +149,6 @@ static apr_status_t test_session_encode(
 
 static apr_status_t test_session_decode(request_rec * r, session_rec * z)
 {
-    apr_status_t result = OK;
     const size_t prefix_len = strlen(TEST_SESSION_ENCODING_PREFIX);
     test_session_dcfg_t *dconf = ap_get_module_config(r->per_dir_config,
                                                       &test_session_module);
@@ -203,7 +202,7 @@ static int test_session_handler(request_
         return DECLINED;
 
     /* Copy the header for SessionHeader from the request to the response. */
-    if (overrides = apr_table_get(r->headers_in, TEST_SESSION_HEADER))
+    if ((overrides = apr_table_get(r->headers_in, TEST_SESSION_HEADER)))
         apr_table_setn(r->headers_out, TEST_SESSION_HEADER, overrides);
 
     /* Additional commands to test the session API via POST. */
@@ -240,15 +239,15 @@ static int test_session_handler(request_
             }
             else if (!strcmp(pair->name, "name")) {
                 apr_size_t len;
-                apr_brigade_length(pair->value, 1, &len);
+                apr_brigade_length(pair->value, 1, (apr_off_t *)&len);
                 fieldName = apr_pcalloc(r->pool, sizeof(char) * len + 1);
-                result = apr_brigade_flatten(pair->value, fieldName, &len);
+                result = apr_brigade_flatten(pair->value, fieldName, (apr_size_t *)&len);
             }
             else if (!strcmp(pair->name, "value")) {
                 apr_size_t len;
-                apr_brigade_length(pair->value, 1, &len);
+                apr_brigade_length(pair->value, 1, (apr_off_t *)&len);
                 fieldValue = apr_pcalloc(r->pool, sizeof(char) * len + 1);
-                result = apr_brigade_flatten(pair->value, fieldValue, &len);
+                result = apr_brigade_flatten(pair->value, fieldValue, (apr_size_t *)&len);
             }
             else {
                 return HTTP_BAD_REQUEST;



Mime
View raw message