mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: move code into load_configuration()

Browse Source 
Move the config file loading code from main() to its own function.

No functional changes.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Pekka Paalanen
2015-03-24 15:56:18 +02:00
parent 49f6d62e9d
commit dc940caae5
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+21 -9
View File
@@ -5212,6 +5212,23 @@ weston_transform_to_string(uint32_t output_transform)
return "<illegal value>"; return "<illegal value>";
} }
static int
load_configuration(struct weston_config **config, int32_t noconfig)
{
*config = NULL;
if (noconfig == 0)
*config = weston_config_parse("weston.ini");
if (*config) {
weston_log("Using config file '%s'\n",
weston_config_get_full_path(*config));
} else {
weston_log("Starting with no config file.\n");
}
return 0;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@@ -5237,7 +5254,7 @@ int main(int argc, char *argv[])
int32_t version = 0; int32_t version = 0;
int32_t noconfig = 0; int32_t noconfig = 0;
int32_t numlock_on; int32_t numlock_on;
struct weston_config *config = NULL; struct weston_config *config;
struct weston_config_section *section; struct weston_config_section *section;
struct wl_client *primary_client; struct wl_client *primary_client;
struct wl_listener primary_client_destroyed; struct wl_listener primary_client_destroyed;
@@ -5294,14 +5311,9 @@ int main(int argc, char *argv[])
if (!signals[0] || !signals[1] || !signals[2] || !signals[3]) if (!signals[0] || !signals[1] || !signals[2] || !signals[3])
goto out_signals; goto out_signals;
if (noconfig == 0) if (load_configuration(&config, noconfig) < 0)
config = weston_config_parse("weston.ini"); goto out_signals;
if (config != NULL) {
weston_log("Using config file '%s'\n",
weston_config_get_full_path(config));
} else {
weston_log("Starting with no config file.\n");
}
section = weston_config_get_section(config, "core", NULL, NULL); section = weston_config_get_section(config, "core", NULL, NULL);
if (!backend) { if (!backend) {