frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: configServerFlags never fails, make it return void 

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-07-29 14:07:39 -04:00
parent 2bf9db1930
commit 30fa6da6f1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86Config.c
View File

@ -760,7 +760,7 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE}, {0}, FALSE},
}; };
static Bool static void
configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
{ {
XF86OptionPtr optp, tmp; XF86OptionPtr optp, tmp;
@ -1046,8 +1046,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.dri2From = X_CONFIG; xf86Info.dri2From = X_CONFIG;
} }
#endif #endif
return TRUE;
} }
Bool Bool
@ -2474,11 +2472,7 @@ xf86HandleConfigFile(Bool autoconfig)
} }
#endif #endif
/* Now process everything else */ /* Now process everything else */
if (!configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options)) { configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options);
ErrorF("Problem when converting the config data structures\n");
return CONFIG_PARSE_ERROR;
}
configFiles(xf86configptr->conf_files); configFiles(xf86configptr->conf_files);
configExtensions(xf86configptr->conf_extensions); configExtensions(xf86configptr->conf_extensions);
#ifdef XF86DRI #ifdef XF86DRI