www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-12-09 11:41:15 +03:00
Code Activity

Silence a sparse warning about inconsistent indenting + some minor style issues

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2015-08-31 20:13:30 +00:00
parent 0a16ce1aa5
commit 8a804d09ba
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/cache/mod_cache_disk.c vendored
View File

@@ -185,7 +185,8 @@ static apr_status_t file_cache_el_final(disk_cache_conf *conf, disk_cache_file_t
return rv; return rv;
} }
static apr_status_t file_cache_temp_cleanup(void *dummy) { static apr_status_t file_cache_temp_cleanup(void *dummy)
{
disk_cache_file_t *file = (disk_cache_file_t *)dummy; disk_cache_file_t *file = (disk_cache_file_t *)dummy;
/* clean up the temporary file */ /* clean up the temporary file */
@@ -293,7 +294,7 @@ static const char* regen_key(apr_pool_t *p, apr_table_t *headers,
* quoted-string expectation-extensions. * quoted-string expectation-extensions.
*/ */
for(i=0, k=0; i < varray->nelts; i++) { for (i=0, k=0; i < varray->nelts; i++) {
header = apr_table_get(headers, elts[i]); header = apr_table_get(headers, elts[i]);
if (!header) { if (!header) {
header = ""; header = "";
@@ -738,7 +739,7 @@ static apr_status_t read_array(request_rec *r, apr_array_header_t* arr,
break; break;
} }
*((const char **) apr_array_push(arr)) = apr_pstrdup(r->pool, w); *((const char **) apr_array_push(arr)) = apr_pstrdup(r->pool, w);
} }
return APR_SUCCESS; return APR_SUCCESS;
@@ -1045,7 +1046,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
APR_BUFFERED | APR_EXCL, dobj->hdrs.pool); APR_BUFFERED | APR_EXCL, dobj->hdrs.pool);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, APLOGNO(00725) ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, APLOGNO(00725)
"could not create header file %s", "could not create header file %s",
dobj->hdrs.tempfile); dobj->hdrs.tempfile);
return rv; return rv;
@@ -1332,7 +1333,7 @@ static apr_status_t commit_entity(cache_handle_t *h, request_rec *r)
if (!dobj->disk_info.header_only) { if (!dobj->disk_info.header_only) {
rv = file_cache_el_final(conf, &dobj->data, r); rv = file_cache_el_final(conf, &dobj->data, r);
} }
else if (dobj->data.file){ else if (dobj->data.file) {
rv = apr_file_remove(dobj->data.file, dobj->data.pool); rv = apr_file_remove(dobj->data.file, dobj->data.pool);
} }
} }
@@ -1382,7 +1383,8 @@ static void *create_dir_config(apr_pool_t *p, char *dummy)
return dconf; return dconf;
} }
static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) { static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv)
{
disk_cache_dir_conf *new = (disk_cache_dir_conf *) apr_pcalloc(p, sizeof(disk_cache_dir_conf)); disk_cache_dir_conf *new = (disk_cache_dir_conf *) apr_pcalloc(p, sizeof(disk_cache_dir_conf));
disk_cache_dir_conf *add = (disk_cache_dir_conf *) addv; disk_cache_dir_conf *add = (disk_cache_dir_conf *) addv;
disk_cache_dir_conf *base = (disk_cache_dir_conf *) basev; disk_cache_dir_conf *base = (disk_cache_dir_conf *) basev;