mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass errors up to caller in ipc-client.c

Browse source 
This removes the dependency on log.c (and transitively, on wlroots).
This commit is contained in:
M Stoeckl 2019-01-19 13:40:01 -05:00
parent 62260ab56e
commit 320fe4ad30
6 changed files with 97 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
swaybar/bar.c
View file

@ -358,8 +358,15 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
wl_list_init(&bar->outputs);
bar->eventloop = loop_create();
bar->ipc_socketfd = ipc_open_socket(socket_path);
bar->ipc_event_socketfd = ipc_open_socket(socket_path);
const char *error = NULL;
bar->ipc_socketfd = ipc_open_socket(socket_path, &error);
if (bar->ipc_socketfd == -1) {
sway_abort("Error opening socket '%s': %s", socket_path, error);
}
bar->ipc_event_socketfd = ipc_open_socket(socket_path, &error);
if (bar->ipc_event_socketfd == -1) {
sway_abort("Error opening socket '%s' again: %s", socket_path, error);
}
if (!ipc_initialize(bar)) {
return false;
}