summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-07-29 14:07:39 -0400
committerAdam Jackson <ajax@redhat.com>2014-09-26 15:27:18 -0400
commit30fa6da6f140d713041942a81f5d6da6736e4f7f (patch)
tree1eff0fb54b2d13f21f2a67548acee153227c8d26
parent2bf9db1930528255a37f9787aeb82e2851f814c2 (diff)
xfree86: configServerFlags never fails, make it return void
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/common/xf86Config.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 3eb7a0f85..bca5b45e9 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