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

18
swaymsg/main.c
View file

@ -10,9 +10,9 @@
#include <ctype.h>
#include <unistd.h>
#include <json-c/json.h>
#include "stringop.h"
#include "ipc-client.h"
#include "log.h"
#include "stringop.h"
void sway_terminate(int exit_code) {
exit(exit_code);
@ -434,9 +434,16 @@ int main(int argc, char **argv) {
}
int ret = 0;
int socketfd = ipc_open_socket(socket_path);
const char *error = NULL;
int socketfd = ipc_open_socket(socket_path, &error);
if (socketfd == -1) {
sway_abort("Error opening socket '%s': %s", socket_path, error);
}
uint32_t len = strlen(command);
char *resp = ipc_single_command(socketfd, type, command, &len);
char *resp = ipc_single_command(socketfd, type, command, &len, &error);
if (!resp) {
sway_abort("Error invoking command '%s': %s", command, error);
}
if (!quiet) {
// pretty print the json
json_object *obj = json_tokener_parse(resp);
@ -466,7 +473,10 @@ int main(int argc, char **argv) {
if (type == IPC_SUBSCRIBE && ret == 0) {
do {
struct ipc_response *reply = ipc_recv_response(socketfd);
struct ipc_response *reply = ipc_recv_response(socketfd, &error);
if (!resp) {
sway_abort("Error receiving response: %s", error);
}
if (!reply) {
break;
}