diff options
| author | Eric Covener <covener@apache.org> | 2012-12-15 13:34:56 +0100 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2012-12-15 13:34:56 +0100 |
| commit | f6949ccc77a96679460258f818e9cd4d7741193f (patch) | |
| tree | a37ef286fcc7d005e3eeeeda873ac6acdb6beec4 /modules/mappers/mod_imagemap.c | |
| parent | httxt2dbm: Correct length computation for the 'value' stored in the DBM file ... (diff) | |
| download | apache2-f6949ccc77a96679460258f818e9cd4d7741193f.tar.xz apache2-f6949ccc77a96679460258f818e9cd4d7741193f.zip | |
const fixes for mod_imagemap, fatal on old xlc due to returning apr_table_get result
from non const function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/mappers/mod_imagemap.c')
| -rw-r--r-- | modules/mappers/mod_imagemap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c index 2df50a412d..58fc1e4cfd 100644 --- a/modules/mappers/mod_imagemap.c +++ b/modules/mappers/mod_imagemap.c @@ -316,7 +316,7 @@ static void read_quoted(char **string, char **quoted_part) /* * returns the mapped URL or NULL. */ -static char *imap_url(request_rec *r, const char *base, const char *value) +static const char *imap_url(request_rec *r, const char *base, const char *value) { /* translates a value into a URL. */ int slen, clen; @@ -455,7 +455,7 @@ static char *imap_url(request_rec *r, const char *base, const char *value) return my_base; } -static int imap_reply(request_rec *r, char *redirect) +static int imap_reply(request_rec *r, const char *redirect) { if (!strcasecmp(redirect, "error")) { /* they actually requested an error! */ @@ -519,7 +519,7 @@ static void menu_comment(request_rec *r, char *menu, char *comment) 'formatted' form */ } -static void menu_default(request_rec *r, char *menu, char *href, char *text) +static void menu_default(request_rec *r, const char *menu, const char *href, const char *text) { char *ehref, *etext; if (!strcasecmp(href, "error") || !strcasecmp(href, "nocontent")) { @@ -544,7 +544,7 @@ static void menu_default(request_rec *r, char *menu, char *href, char *text) return; } -static void menu_directive(request_rec *r, char *menu, char *href, char *text) +static void menu_directive(request_rec *r, const char *menu, const char *href, const char *text) { char *ehref, *etext; if (!strcasecmp(href, "error") || !strcasecmp(href, "nocontent")) { @@ -580,9 +580,9 @@ static int imap_handler_internal(request_rec *r) char *directive; char *value; char *href_text; - char *base; - char *redirect; - char *mapdflt; + const char *base; + const char *redirect; + const char *mapdflt; char *closest = NULL; double closest_yet = -1; apr_status_t status; |