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

config: error messages non-fatal, and before we free them 

Move error messages before we free the error structure, and make them all
non-fatal.
This commit is contained in:
Daniel Stone 2006-11-08 14:06:51 +02:00 committed by Daniel Stone
parent e2b78df580
commit 988757a441
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/config.c
View File

@ -258,7 +258,7 @@ configInitialise()
dbus_error_init(&error); dbus_error_init(&error);
bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error); bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
if (!bus || dbus_error_is_set(&error)) { if (!bus || dbus_error_is_set(&error)) {
FatalError("[dbus] some kind of error occurred: %s (%s)\n", error.name, ErrorF("[dbus] some kind of error occurred: %s (%s)\n", error.name,
error.message); error.message);
dbus_error_free(&error); dbus_error_free(&error);
return; return;
@ -266,41 +266,43 @@ configInitialise()
if (!dbus_connection_get_unix_fd(bus, &configfd)) { if (!dbus_connection_get_unix_fd(bus, &configfd)) {
dbus_connection_unref(bus); dbus_connection_unref(bus);
ErrorF("[dbus] couldn't get fd for bus\n");
dbus_error_free(&error);
configfd = -1; configfd = -1;
FatalError("[dbus] couldn't get fd for bus\n");
return; return;
} }
snprintf(busname, sizeof(busname), "org.x.config.display%d", atoi(display)); snprintf(busname, sizeof(busname), "org.x.config.display%d", atoi(display));
if (!dbus_bus_request_name(bus, busname, 0, &error) || if (!dbus_bus_request_name(bus, busname, 0, &error) ||
dbus_error_is_set(&error)) { dbus_error_is_set(&error)) {
dbus_connection_unref(bus); ErrorF("[dbus] couldn't take over org.x.config: %s (%s)\n",
configfd = -1;
FatalError("[dbus] couldn't take over org.x.config: %s (%s)\n",
error.name, error.message); error.name, error.message);
dbus_error_free(&error); dbus_error_free(&error);
dbus_connection_unref(bus);
configfd = -1;
return; return;
} }
/* blocks until we get a reply. */ /* blocks until we get a reply. */
dbus_bus_add_match(bus, MATCH_RULE, &error); dbus_bus_add_match(bus, MATCH_RULE, &error);
if (dbus_error_is_set(&error)) { if (dbus_error_is_set(&error)) {
ErrorF("[dbus] couldn't match X.Org rule: %s (%s)\n", error.name,
error.message);
dbus_error_free(&error);
dbus_bus_release_name(bus, busname, &error); dbus_bus_release_name(bus, busname, &error);
dbus_connection_unref(bus); dbus_connection_unref(bus);
configfd = -1; configfd = -1;
FatalError("[dbus] couldn't match X.Org rule: %s (%s)\n", error.name,
error.message);
dbus_error_free(&error);
return; return;
} }
snprintf(busobject, sizeof(busobject), "/org/x/config/%d", atoi(display)); snprintf(busobject, sizeof(busobject), "/org/x/config/%d", atoi(display));
if (!dbus_connection_register_object_path(bus, busobject, &vtable, bus)) { if (!dbus_connection_register_object_path(bus, busobject, &vtable, bus)) {
ErrorF("[dbus] couldn't register object path\n");
configfd = -1; configfd = -1;
dbus_bus_release_name(bus, busname, &error); dbus_bus_release_name(bus, busname, &error);
dbus_bus_remove_match(bus, MATCH_RULE, &error); dbus_bus_remove_match(bus, MATCH_RULE, &error);
dbus_connection_unref(bus); dbus_connection_unref(bus);
FatalError("[dbus] couldn't register object path\n"); dbus_error_free(&error);
return; return;
} }