mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: improve error reporting

Browse source
This commit is contained in:
Wim Taymans 2020-04-04 20:23:42 +02:00
parent 95906ca52e
commit 7927a66fdd
4 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/pw-cli.c
View file

@ -2795,6 +2795,7 @@ int main(int argc, char *argv[])
opt_remote = optarg; opt_remote = optarg;
break; break;
default: default:
show_help(&data, argv[0]);
return -1; return -1;
} }
} }

13
src/tools/pw-dot.c
View file

@ -811,29 +811,36 @@ int main(int argc, char *argv[])
fprintf(stdout, "set output file %s\n", dot_path); fprintf(stdout, "set output file %s\n", dot_path);
break; break;
default: default:
show_help(argv[0]);
return -1; return -1;
} }
} }
data.loop = pw_main_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
if (data.loop == NULL) if (data.loop == NULL) {
fprintf(stderr, "can't create main loop: %m\n");
return -1; return -1;
}
l = pw_main_loop_get_loop(data.loop); l = pw_main_loop_get_loop(data.loop);
pw_loop_add_signal(l, SIGINT, do_quit, &data); pw_loop_add_signal(l, SIGINT, do_quit, &data);
pw_loop_add_signal(l, SIGTERM, do_quit, &data); pw_loop_add_signal(l, SIGTERM, do_quit, &data);
data.context = pw_context_new(l, NULL, 0); data.context = pw_context_new(l, NULL, 0);
if (data.context == NULL) if (data.context == NULL) {
fprintf(stderr, "can't create context: %m\n");
return -1; return -1;
}
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, opt_remote,
NULL), NULL),
0); 0);
if (data.core == NULL) if (data.core == NULL) {
fprintf(stderr, "can't connect: %m\n");
return -1; return -1;
}
data.dot_str = dot_str_new(); data.dot_str = dot_str_new();
if (data.dot_str == NULL) if (data.dot_str == NULL)

13
src/tools/pw-mon.c
View file

@ -720,21 +720,26 @@ int main(int argc, char *argv[])
opt_remote = optarg; opt_remote = optarg;
break; break;
default: default:
show_help(argv[0]);
return -1; return -1;
} }
} }
data.loop = pw_main_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
if (data.loop == NULL) if (data.loop == NULL) {
fprintf(stderr, "can't create main loop: %m\n");
return -1; return -1;
}
l = pw_main_loop_get_loop(data.loop); l = pw_main_loop_get_loop(data.loop);
pw_loop_add_signal(l, SIGINT, do_quit, &data); pw_loop_add_signal(l, SIGINT, do_quit, &data);
pw_loop_add_signal(l, SIGTERM, do_quit, &data); pw_loop_add_signal(l, SIGTERM, do_quit, &data);
data.context = pw_context_new(l, NULL, 0); data.context = pw_context_new(l, NULL, 0);
if (data.context == NULL) if (data.context == NULL) {
fprintf(stderr, "can't create context: %m\n");
return -1; return -1;
}
spa_list_init(&data.pending_list); spa_list_init(&data.pending_list);
@ -743,8 +748,10 @@ int main(int argc, char *argv[])
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, opt_remote,
NULL), NULL),
0); 0);
if (data.core == NULL) if (data.core == NULL) {
fprintf(stderr, "can't connect: %m\n");
return -1; return -1;
}
pw_core_add_listener(data.core, pw_core_add_listener(data.core,
&data.core_listener, &data.core_listener,

9
src/tools/pw-profiler.c
View file

@ -586,13 +586,14 @@ int main(int argc, char *argv[])
opt_remote = optarg; opt_remote = optarg;
break; break;
default: default:
show_help(argv[0]);
return -1; return -1;
} }
} }
data.loop = pw_main_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
if (data.loop == NULL) { if (data.loop == NULL) {
fprintf(stderr, "Can't create data loop: %m"); fprintf(stderr, "Can't create data loop: %m\n");
return -1; return -1;
} }
@ -602,7 +603,7 @@ int main(int argc, char *argv[])
data.context = pw_context_new(l, NULL, 0); data.context = pw_context_new(l, NULL, 0);
if (data.context == NULL) { if (data.context == NULL) {
fprintf(stderr, "Can't create context: %m"); fprintf(stderr, "Can't create context: %m\n");
return -1; return -1;
} }
@ -614,7 +615,7 @@ int main(int argc, char *argv[])
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {
fprintf(stderr, "Can't connect: %m"); fprintf(stderr, "Can't connect: %m\n");
return -1; return -1;
} }
@ -622,7 +623,7 @@ int main(int argc, char *argv[])
data.output = fopen(data.filename, "w"); data.output = fopen(data.filename, "w");
if (data.output == NULL) { if (data.output == NULL) {
fprintf(stderr, "Can't open file %s: %m", data.filename); fprintf(stderr, "Can't open file %s: %m\n", data.filename);
return -1; return -1;
} }