hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-28 02:21:08 +00:00
Code Issues Projects Releases Wiki Activity

xfree86: common: improved formatting, log messages and logic in xf86Config.c

Browse source 
Signed by: RotaryBoot58, <petersoncraft20@proton.me>
This commit is contained in:
RotaryBoot58 2026-07-23 15:04:27 -03:00 • committed by Enrico Weigelt
commit a1c22617c5
1 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hw/xfree86/common/xf86Config.c
View file

@ -2186,49 +2186,48 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
{ {
XF86OptionPtr o; XF86OptionPtr o;
if (conf_ext && conf_ext->ext_option_lst) { if(conf_ext && conf_ext->ext_option_lst)
for (o = conf_ext->ext_option_lst; o; o = xf86NextOption(o)) { {
for(o = conf_ext->ext_option_lst; o; o = xf86NextOption(o))
{
char *name = xf86OptionName(o); char *name = xf86OptionName(o);
char *val = xf86OptionValue(o); char *val = xf86OptionValue(o);
char *n; char *n;
bool enable = TRUE; bool enable = TRUE;
/* Handle "No<ExtensionName>" */ // Handles extensions that start with "No" like NoComposite
n = xf86NormalizeName(name); n = xf86NormalizeName(name);
if (strncmp(n, "no", 2) == 0) { if(strncmp(n, "no", 2) == 0)
{
name += 2; name += 2;
enable = FALSE; enable = FALSE;
} }
if (!val || if(!xf86NameCmp(val, "disable"))
xf86NameCmp(val, "enable") == 0 || {
xf86NameCmp(val, "enabled") == 0 ||
xf86NameCmp(val, "on") == 0 ||
xf86NameCmp(val, "1") == 0 ||
xf86NameCmp(val, "yes") == 0 || xf86NameCmp(val, "true") == 0) {
/* NOTHING NEEDED -- enabling is handled below */
}
else if (xf86NameCmp(val, "disable") == 0 ||
xf86NameCmp(val, "disabled") == 0 ||
xf86NameCmp(val, "off") == 0 ||
xf86NameCmp(val, "0") == 0 ||
xf86NameCmp(val, "no") == 0 ||
xf86NameCmp(val, "false") == 0) {
enable = !enable; enable = !enable;
} }
else { else
{
LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized value \"%s\"\n", val); LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized value \"%s\"\n", val);
free(n); free(n);
continue; continue;
} }
if (EnableDisableExtension(name, enable)) { if(!EnableDisableExtension(name, enable))
LogMessageVerb(X_CONFIG, 1, "Extension \"%s\" is %s\n", {
name, enable ? "enabled" : "disabled"); LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized extension \"%s\"\n", name);
} }
else { else
LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized extension \"%s\"\n", {
name); if(enable)
{
LogMessageVerb(X_CONFIG, 1, "Enabling extension %s\n", name);
}
else
{
LogMessageVerb(X_CONFIG, 1, "Disabling extension: %s\n", name);
}
} }
free(n); free(n);
} }