commit 14e438c8a2bc7342489d248a3d66b9123245d552
author Kristian Høgsberg <krh@bitplanet.net> Sun May 26 21:48:14 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Sun May 26 21:48:14 2013 -0400
tree fe1d3774c4e00f9030f6a78481d1a49472178bea
parent 115b0f729c99d6b9f7ffa004209249094fe871f0

compositor: Parse config file in main(), only keep weston config object

Now that all backends and modules have been converted to the new
config parser API, we don't have to keep the fd around.

src/compositor-fbdev.c

diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index c643c23..898933f 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -836,7 +836,8 @@
 
 static struct weston_compositor *
 fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[],
-                        int config_fd, struct fbdev_parameters *param)
+                        struct weston_config *config,
+			struct fbdev_parameters *param)
 {
 	struct fbdev_compositor *compositor;
 	const char *seat = default_seat;
@@ -849,7 +850,7 @@
 		return NULL;
 
 	if (weston_compositor_init(&compositor->base, display, argc, argv,
-	                           config_fd) < 0)
+	                           config) < 0)
 		goto out_free;
 
 	compositor->udev = udev_new();
@@ -907,7 +908,7 @@
 
 WL_EXPORT struct weston_compositor *
 backend_init(struct wl_display *display, int *argc, char *argv[],
-	     int config_fd)
+	     struct weston_config *config)
 {
 	/* TODO: Ideally, available frame buffers should be enumerated using
 	 * udev, rather than passing a device node in as a parameter. */
@@ -923,6 +924,5 @@
 
 	parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv);
 
-	return fbdev_compositor_create(display, argc, argv, config_fd,
-	                               &param);
+	return fbdev_compositor_create(display, argc, argv, config, &param);
 }