[PATCH 02/16] xf86AutoConfig: Simplify builtin-config splitting.

Jamey Sharp jamey at minilop.net
Wed May 26 10:40:51 PDT 2010


On Wed, May 26, 2010 at 1:29 AM, Mark Kettenis <mark.kettenis at xs4all.nl> wrote:
>> From: Jamey Sharp <jamey at minilop.net>
>> Date: Tue, 25 May 2010 16:53:13 -0700
>>
>> @@ -179,7 +169,7 @@ xf86AutoConfig(void)
>>      xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n");
>>
>>      xf86initConfigFiles();
>> -    xf86setBuiltinConfig(builtinConfig);
>> +    xf86setBuiltinConfig((const char **) builtinConfig);
>
> That cast isn't really necessary isn't it?

I wasn't happy about it either, but at least according to GCC, while
"const char *" is assignment-compatible from "char *", "const char **"
is not compatible with "char **". So I was going to have to cast
either at the call to free or this call to xf86setBuiltinConfig, and
this seemed more sane to me.

I was tempted to kill xf86setBuiltinConfig entirely and let the two
source files just share the same global variable, but I thought that
should be a separate patch, and the whole configuration parser seems
like it could use love anyway.

Jamey


More information about the xorg-devel mailing list