mirrors/waybox
1
0
Fork 0
mirror of https://github.com/wizbright/waybox.git synced 2025-10-29 05:40:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cut down the blank lines in the debug logs

Browse source 
It seems that wlr_log already outputs an end-of-line character
This commit is contained in:
Keith Bowes 2020-03-09 22:50:41 -04:00
parent 7bb4e79256
commit 6dab63841c
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
waybox/main.c
View file

@ -47,7 +47,7 @@ int main(int argc, char **argv) {
return 0; return 0;
} else if (!strcmp("--config-file", argv[i]) || } else if (!strcmp("--config-file", argv[i]) ||
!strcmp("--sm-disable", argv[i])) { !strcmp("--sm-disable", argv[i])) {
fprintf(stderr, _("Warning: option '%s' hasn't been implemented yet.\n"), argv[i]); fprintf(stderr, _("%s hasn't been implemented yet.\n"), argv[i]);
if (i == argc - 1) { if (i == argc - 1) {
fprintf(stderr, _("%s requires an argument\n"), argv[i]); fprintf(stderr, _("%s requires an argument\n"), argv[i]);
} }
@ -61,13 +61,17 @@ int main(int argc, char **argv) {
wlr_log_init(debug ? WLR_DEBUG : WLR_ERROR, NULL); wlr_log_init(debug ? WLR_DEBUG : WLR_ERROR, NULL);
struct wb_server server = {0}; struct wb_server server = {0};
if (!wb_create_backend(&server)) { if (wb_create_backend(&server)) {
wlr_log(WLR_ERROR, "%s\n", _("Failed to create backend")); wlr_log(WLR_INFO, "%s", _("Successfully created backend"));
} else {
wlr_log(WLR_ERROR, "%s", _("Failed to create backend"));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!wb_start_server(&server)) { if (wb_start_server(&server)) {
wlr_log(WLR_ERROR, "%s\n", _("Failed to start server")); wlr_log(WLR_INFO, "%s", _("Successfully started server"));
} else {
wlr_log(WLR_ERROR, "%s", _("Failed to start server"));
wb_terminate(&server); wb_terminate(&server);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

8
waybox/server.c
View file

@ -5,7 +5,7 @@ bool wb_create_backend(struct wb_server* server) {
// create display // create display
server->wl_display = wl_display_create(); server->wl_display = wl_display_create();
if (server->wl_display == NULL) { if (server->wl_display == NULL) {
wlr_log(WLR_ERROR, "%s\n", _("Failed to connect to a Wayland display")); wlr_log(WLR_ERROR, "%s", _("Failed to connect to a Wayland display"));
return false; return false;
} }
@ -40,7 +40,7 @@ bool wb_start_server(struct wb_server* server) {
} }
if (!wlr_backend_start(server->backend)) { if (!wlr_backend_start(server->backend)) {
wlr_log(WLR_ERROR, "%s\n", _("Failed to start backend")); wlr_log(WLR_ERROR, "%s", _("Failed to start backend"));
wlr_backend_destroy(server->backend); wlr_backend_destroy(server->backend);
wl_display_destroy(server->wl_display); wl_display_destroy(server->wl_display);
return false; return false;
@ -50,7 +50,7 @@ bool wb_start_server(struct wb_server* server) {
char *sockmsg = calloc(sizeof(char), strlen(tmp) + strlen(socket) - 2); char *sockmsg = calloc(sizeof(char), strlen(tmp) + strlen(socket) - 2);
if (sockmsg) { if (sockmsg) {
sprintf(sockmsg, tmp, socket); sprintf(sockmsg, tmp, socket);
wlr_log(WLR_INFO, "%s\n", sockmsg); wlr_log(WLR_INFO, "%s", sockmsg);
} }
free(sockmsg); free(sockmsg);
setenv("WAYLAND_DISPLAY", socket, true); setenv("WAYLAND_DISPLAY", socket, true);
@ -74,7 +74,7 @@ bool wb_terminate(struct wb_server* server) {
wlr_output_layout_destroy(server->layout); wlr_output_layout_destroy(server->layout);
wl_display_destroy(server->wl_display); wl_display_destroy(server->wl_display);
wlr_log(WLR_INFO, "%s\n", _("Display destroyed")); wlr_log(WLR_INFO, "%s", _("Display destroyed"));
return true; return true;
} }