diff options
author | Christophe Jaillet <jailletc36@apache.org> | 2015-02-14 19:40:16 +0000 |
---|---|---|
committer | Christophe Jaillet <jailletc36@apache.org> | 2015-02-14 19:40:16 +0000 |
commit | 319422a6fb61c9ffb551e32537c459f73ebb3cb2 (patch) | |
tree | 4af0d7bff6f290f3e821451649d2b0e6c2b11768 /docs/manual | |
parent | 124f27267c57f9afd46ed98cef05c1e0d8835e45 (diff) | |
download | httpd-319422a6fb61c9ffb551e32537c459f73ebb3cb2.tar.gz |
Fix doc as spotted by Andrew Stayart in online doc
+ be consistent with the position of '*'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659848 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r-- | docs/manual/developer/modguide.html.en | 34 | ||||
-rw-r--r-- | docs/manual/developer/modguide.xml | 34 |
2 files changed, 34 insertions, 34 deletions
diff --git a/docs/manual/developer/modguide.html.en b/docs/manual/developer/modguide.html.en index efe85b2d85..542f391a2b 100644 --- a/docs/manual/developer/modguide.html.en +++ b/docs/manual/developer/modguide.html.en @@ -484,9 +484,9 @@ apr_pool_t *p, const char *fmt, ...)</code>: Similar to <code>sprintf</code>, ex <pre class="prettyprint lang-c">static int example_handler(request_rec *r) { - const char* original = "You can't edit this!"; - char* copy; - int* integers; + const char *original = "You can't edit this!"; + char *copy; + int *integers; /* Allocate space for 10 integer values and set them all to zero. */ integers = apr_pcalloc(r->pool, sizeof(int)*10); @@ -905,7 +905,7 @@ const char *example_set_path(cmd_parms *cmd, void *cfg, const char *arg) /* Handler for the "exampleAction" directive */ /* Let's pretend this one takes one argument (file or db), and a second (deny or allow), */ /* and we store it in a bit-wise manner. */ -const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char* arg2) +const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2) { if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01; else config.typeOfAction = 0x02; @@ -974,7 +974,7 @@ const char *example_set_path(cmd_parms *cmd, void *cfg, const char *arg) /* Handler for the "exampleAction" directive */ /* Let's pretend this one takes one argument (file or db), and a second (deny or allow), */ /* and we store it in a bit-wise manner. */ -const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char* arg2) +const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2) { if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01; else config.typeOfAction = 0x02; @@ -1210,12 +1210,12 @@ our first step is to make a function for creating new, blank configurations. We do so by creating the function we just referenced in our name tag as the Per-directory configuration handler:</p> -<pre class="prettyprint lang-c">void* create_dir_conf(apr_pool_t* pool, char* context) { +<pre class="prettyprint lang-c">void *create_dir_conf(apr_pool_t *pool, char *context) { context = context ? context : "(undefined context)"; example_config *cfg = apr_pcalloc(pool, sizeof(example_config)); if(cfg) { /* Set some default values */ - strcpy(cfg->context, x); + strcpy(cfg->context, context); cfg->enabled = 0; cfg->path = "/foo/bar"; cfg->typeOfAction = 0x11; @@ -1264,10 +1264,10 @@ two configurations and decide how they are to be merged:</p> -<pre class="prettyprint lang-c">void* merge_dir_conf(apr_pool_t* pool, void* BASE, void* ADD) { - example_config* base = (example_config *) BASE ; /* This is what was set in the parent context */ - example_config* add = (example_config *) ADD ; /* This is what is set in the new context */ - example_config* conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */ +<pre class="prettyprint lang-c">void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD) { + example_config *base = (example_config *) BASE ; /* This is what was set in the parent context */ + example_config *add = (example_config *) ADD ; /* This is what is set in the new context */ + example_config *conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */ /* Merge configurations */ conf->enabled = ( add->enabled == 0 ) ? base->enabled : add->enabled ; @@ -1564,18 +1564,18 @@ or check out the rest of our documentation for further tips. <pre class="prettyprint lang-c">typedef struct { - const char* key; - const char* value; + const char *key; + const char *value; } keyValuePair; -keyValuePair* readPost(request_rec* r) { +keyValuePair *readPost(request_rec *r) { apr_array_header_t *pairs = NULL; apr_off_t len; apr_size_t size; int res; int i = 0; char *buffer; - keyValuePair* kvp; + keyValuePair *kvp; res = ap_parse_form_data(r, NULL, &pairs, -1, HUGE_STRING_LEN); if (res != OK || !pairs) return NULL; /* Return NULL if we failed or if there are is no POST data */ @@ -1597,7 +1597,7 @@ keyValuePair* readPost(request_rec* r) { static int example_handler(request_rec *r) { /*~~~~~~~~~~~~~~~~~~~~~~*/ - keyValuePair* formData; + keyValuePair *formData; /*~~~~~~~~~~~~~~~~~~~~~~*/ formData = readPost(r); @@ -1687,7 +1687,7 @@ static int example_handler(request_rec *r) return(rc); } -static int example_handler(request_rec* r) +static int example_handler(request_rec *r) { /*~~~~~~~~~~~~~~~~*/ apr_off_t size; diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml index 7e1abacd00..28c8242402 100644 --- a/docs/manual/developer/modguide.xml +++ b/docs/manual/developer/modguide.xml @@ -488,9 +488,9 @@ apr_pool_t *p, const char *fmt, ...)</code>: Similar to <code>sprintf</code>, ex <highlight language="c"> static int example_handler(request_rec *r) { - const char* original = "You can't edit this!"; - char* copy; - int* integers; + const char *original = "You can't edit this!"; + char *copy; + int *integers; /* Allocate space for 10 integer values and set them all to zero. */ integers = apr_pcalloc(r->pool, sizeof(int)*10); @@ -920,7 +920,7 @@ const char *example_set_path(cmd_parms *cmd, void *cfg, const char *arg) /* Handler for the "exampleAction" directive */ /* Let's pretend this one takes one argument (file or db), and a second (deny or allow), */ /* and we store it in a bit-wise manner. */ -const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char* arg2) +const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2) { if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01; else config.typeOfAction = 0x02; @@ -990,7 +990,7 @@ const char *example_set_path(cmd_parms *cmd, void *cfg, const char *arg) /* Handler for the "exampleAction" directive */ /* Let's pretend this one takes one argument (file or db), and a second (deny or allow), */ /* and we store it in a bit-wise manner. */ -const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char* arg2) +const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, const char *arg2) { if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01; else config.typeOfAction = 0x02; @@ -1234,12 +1234,12 @@ configurations. We do so by creating the function we just referenced in our name tag as the Per-directory configuration handler:</p> <!-- BEGIN EXAMPLE CODE --> <highlight language="c"> -void* create_dir_conf(apr_pool_t* pool, char* context) { +void *create_dir_conf(apr_pool_t *pool, char *context) { context = context ? context : "(undefined context)"; example_config *cfg = apr_pcalloc(pool, sizeof(example_config)); if(cfg) { /* Set some default values */ - strcpy(cfg->context, x); + strcpy(cfg->context, context); cfg->enabled = 0; cfg->path = "/foo/bar"; cfg->typeOfAction = 0x11; @@ -1290,10 +1290,10 @@ two configurations and decide how they are to be merged:</p> <!-- BEGIN EXAMPLE CODE --> <highlight language="c"> -void* merge_dir_conf(apr_pool_t* pool, void* BASE, void* ADD) { - example_config* base = (example_config *) BASE ; /* This is what was set in the parent context */ - example_config* add = (example_config *) ADD ; /* This is what is set in the new context */ - example_config* conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */ +void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD) { + example_config *base = (example_config *) BASE ; /* This is what was set in the parent context */ + example_config *add = (example_config *) ADD ; /* This is what is set in the new context */ + example_config *conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */ /* Merge configurations */ conf->enabled = ( add->enabled == 0 ) ? base->enabled : add->enabled ; @@ -1593,18 +1593,18 @@ or check out the rest of our documentation for further tips. <!-- BEGIN EXAMPLE CODE --> <highlight language="c"> typedef struct { - const char* key; - const char* value; + const char *key; + const char *value; } keyValuePair; -keyValuePair* readPost(request_rec* r) { +keyValuePair *readPost(request_rec *r) { apr_array_header_t *pairs = NULL; apr_off_t len; apr_size_t size; int res; int i = 0; char *buffer; - keyValuePair* kvp; + keyValuePair *kvp; res = ap_parse_form_data(r, NULL, &pairs, -1, HUGE_STRING_LEN); if (res != OK || !pairs) return NULL; /* Return NULL if we failed or if there are is no POST data */ @@ -1626,7 +1626,7 @@ keyValuePair* readPost(request_rec* r) { static int example_handler(request_rec *r) { /*~~~~~~~~~~~~~~~~~~~~~~*/ - keyValuePair* formData; + keyValuePair *formData; /*~~~~~~~~~~~~~~~~~~~~~~*/ formData = readPost(r); @@ -1718,7 +1718,7 @@ static int util_read(request_rec *r, const char **rbuf, apr_off_t *size) return(rc); } -static int example_handler(request_rec* r) +static int example_handler(request_rec *r) { /*~~~~~~~~~~~~~~~~*/ apr_off_t size; |