summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2012-12-17 23:19:36 +0100
committerBertrand Jacquin <beber@meleeweb.net>2012-12-17 23:19:36 +0100
commit5b15aca0bc19e5b21cd3692b0c37acf9e347cd97 (patch)
tree3de9ff33a43a1188f0a58032f56ec8cb96c30cb8
parent[MISC] Reindent all functions braces to match (diff)
downloadmod_virtualvalue-5b15aca0bc19e5b21cd3692b0c37acf9e347cd97.tar.gz
[MISC] Reindent to get max 80 chargs long
-rw-r--r--al_core.c4
-rw-r--r--al_php5.c3
-rw-r--r--mod_virtualvalue.c24
3 files changed, 22 insertions, 9 deletions
diff --git a/al_core.c b/al_core.c
index 3f992d2..481a5b3 100644
--- a/al_core.c
+++ b/al_core.c
@@ -23,7 +23,9 @@ int vv_core_docroot(request_rec *r, char *n_root)
/* Then, also define core DOCUMENT_ROOT,
* so PHP and CGI have a correct DOCUMENT_ROOT env variable */
top = (r->main)? r->main : r;
- core = (core_server_config *)ap_get_module_config(r->server->module_config, &core_module);
+ core =
+ (core_server_config *)ap_get_module_config(r->server->module_config,
+ &core_module);
core->ap_document_root = apr_pstrdup(top->pool, n_root);
diff --git a/al_php5.c b/al_php5.c
index 2f0a108..dada510 100644
--- a/al_php5.c
+++ b/al_php5.c
@@ -23,7 +23,8 @@ int vv_php_alter_ini(int argc __U__, char **argv, request_rec *r)
VV_debug("Translating %s %s", argv[0], argv[1]);
arg = vv_flat_arg(argv[1], r);
- if (zend_alter_ini_entry(argv[0], strlen(argv[0]) + 1, arg, strlen(arg), PHP_INI_SYSTEM, PHP_INI_STAGE_STARTUP) == -1)
+ if (zend_alter_ini_entry(argv[0], strlen(argv[0]) + 1, arg, strlen(arg),
+ PHP_INI_SYSTEM, PHP_INI_STAGE_STARTUP) == -1)
VV_error("zend_alter_ini_entry() failed (%s %s)", argv[0], arg);
VV_debug("Altered to %s %s", argv[0], arg);
diff --git a/mod_virtualvalue.c b/mod_virtualvalue.c
index 56f1125..5b89d35 100644
--- a/mod_virtualvalue.c
+++ b/mod_virtualvalue.c
@@ -75,7 +75,8 @@ static virtualvalue_var_t *vv_var_new(apr_pool_t *pool)
return (elm);
}
-static virtualvalue_var_t *vv_var_append(virtualvalue_var_t *list, virtualvalue_var_t *elm)
+static virtualvalue_var_t *vv_var_append(virtualvalue_var_t *list,
+ virtualvalue_var_t *elm)
{
virtualvalue_var_t *c;
@@ -255,12 +256,14 @@ char *vv_flat_arg(char *s1, request_rec *r)
static void *vv_create_server_config(apr_pool_t *p, server_rec *s __U__)
{
- virtualvalue_cfg_t *cfg = (virtualvalue_cfg_t *)apr_pcalloc(p, sizeof(virtualvalue_cfg_t));
+ virtualvalue_cfg_t *cfg =
+ (virtualvalue_cfg_t *)apr_pcalloc(p, sizeof(virtualvalue_cfg_t));
return (void *)cfg;
}
-static void *vv_merge_server_config(apr_pool_t *p __U__, void *parent __U__, void *child)
+static void *vv_merge_server_config(apr_pool_t *p __U__,
+ void *parent __U__, void *child)
{
virtualvalue_cfg_t *c_cfg = (virtualvalue_cfg_t *)child;
@@ -269,7 +272,9 @@ static void *vv_merge_server_config(apr_pool_t *p __U__, void *parent __U__, voi
static int vv_translate(request_rec *r)
{
- virtualvalue_cfg_t *c = (virtualvalue_cfg_t *)ap_get_module_config(r->server->module_config, &virtualvalue_module);
+ virtualvalue_cfg_t *c =
+ (virtualvalue_cfg_t *)ap_get_module_config(r->server->module_config,
+ &virtualvalue_module);
virtualvalue_var_t *n;
if (!c->vars)
@@ -288,9 +293,12 @@ static int vv_translate(request_rec *r)
return (DECLINED);
}
-static const char *vv_set(cmd_parms *cmd, void *struct_ptr __U__, int argc, char *const argv[])
+static const char *vv_set(cmd_parms *cmd, void *struct_ptr __U__,
+ int argc, char *const argv[])
{
- virtualvalue_cfg_t *c = (virtualvalue_cfg_t *)ap_get_module_config(cmd->server->module_config, &virtualvalue_module);
+ virtualvalue_cfg_t *c =
+ (virtualvalue_cfg_t *)ap_get_module_config(cmd->server->module_config,
+ &virtualvalue_module);
virtualvalue_var_t *n;
token_t *i;
@@ -339,7 +347,9 @@ static const char *vv_set(cmd_parms *cmd, void *struct_ptr __U__, int argc, char
static const char *vv_on(cmd_parms *cmd, void *struct_ptr __U__, int flag)
{
- virtualvalue_cfg_t *cfg = (virtualvalue_cfg_t *)ap_get_module_config(cmd->server->module_config, &virtualvalue_module);
+ virtualvalue_cfg_t *cfg =
+ (virtualvalue_cfg_t *)ap_get_module_config(cmd->server->module_config,
+ &virtualvalue_module);
cfg->enable = (flag ? 1 : 0);
VV_debug("VirtualValue enable: %i", (unsigned int)cfg->enable);