[PATCH 16/19] xfree86: configServerFlags never fails, make it return void
Adam Jackson
ajax at redhat.com
Thu Sep 25 10:37:32 PDT 2014
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/xfree86/common/xf86Config.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 3eb7a0f..bca5b45 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -760,7 +760,7 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE},
};
-static Bool
+static void
configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
{
XF86OptionPtr optp, tmp;
@@ -1046,8 +1046,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.dri2From = X_CONFIG;
}
#endif
-
- return TRUE;
}
Bool
@@ -2474,11 +2472,7 @@ xf86HandleConfigFile(Bool autoconfig)
}
#endif
/* Now process everything else */
- if (!configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options)) {
- ErrorF("Problem when converting the config data structures\n");
- return CONFIG_PARSE_ERROR;
- }
-
+ configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options);
configFiles(xf86configptr->conf_files);
configExtensions(xf86configptr->conf_extensions);
#ifdef XF86DRI
--
1.9.3
More information about the xorg-devel
mailing list