You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2012/12/15 13:34:57 UTC
svn commit: r1422234 - /httpd/httpd/trunk/modules/mappers/mod_imagemap.c
Author: covener
Date: Sat Dec 15 12:34:56 2012
New Revision: 1422234
URL: http://svn.apache.org/viewvc?rev=1422234&view=rev
Log:
const fixes for mod_imagemap, fatal on old xlc due to returning apr_table_get result
from non const function.
Modified:
httpd/httpd/trunk/modules/mappers/mod_imagemap.c
Modified: httpd/httpd/trunk/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_imagemap.c?rev=1422234&r1=1422233&r2=1422234&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_imagemap.c Sat Dec 15 12:34:56 2012
@@ -316,7 +316,7 @@ static void read_quoted(char **string, c
/*
* 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, co
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,
'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,
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
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;
Re: svn commit: r1422234 - /httpd/httpd/trunk/modules/mappers/mod_imagemap.c
Posted by Eric Covener <co...@gmail.com>.
On Sat, Dec 15, 2012 at 9:03 AM, Rainer Jung <ra...@kippdata.de> wrote:
> On 15.12.2012 13:34, covener@apache.org wrote:
>> Author: covener
>> Date: Sat Dec 15 12:34:56 2012
>> New Revision: 1422234
>>
>> URL: http://svn.apache.org/viewvc?rev=1422234&view=rev
>> Log:
>> const fixes for mod_imagemap, fatal on old xlc due to returning apr_table_get result
>> from non const function.
>
> Sorry I can't check more detailed currently, but have you seen a
> probably related backport proposal of fuankg in STATUS?
>
Yes, I see now. Checking it out.
Re: svn commit: r1422234 - /httpd/httpd/trunk/modules/mappers/mod_imagemap.c
Posted by Rainer Jung <ra...@kippdata.de>.
On 15.12.2012 13:34, covener@apache.org wrote:
> Author: covener
> Date: Sat Dec 15 12:34:56 2012
> New Revision: 1422234
>
> URL: http://svn.apache.org/viewvc?rev=1422234&view=rev
> Log:
> const fixes for mod_imagemap, fatal on old xlc due to returning apr_table_get result
> from non const function.
Sorry I can't check more detailed currently, but have you seen a
probably related backport proposal of fuankg in STATUS?
Regards,
Rainer