mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-08 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

util: add wlr_ prefix to log symbols

Browse source
This commit is contained in:
emersion 2018-07-09 22:49:54 +01:00
parent ffc8780893
commit 7cbef15206
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
98 changed files with 631 additions and 629 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rootston/main.c
View file

@ -15,7 +15,7 @@
struct roots_server server = { 0 };
int main(int argc, char **argv) {
wlr_log_init(L_DEBUG, NULL);
wlr_log_init(WLR_DEBUG, NULL);
server.config = roots_config_create_from_args(argc, argv);
server.wl_display = wl_display_create();
server.wl_event_loop = wl_display_get_event_loop(server.wl_display);
@ -23,7 +23,7 @@ int main(int argc, char **argv) {
server.backend = wlr_backend_autocreate(server.wl_display, NULL);
if (server.backend == NULL) {
wlr_log(L_ERROR, "could not start backend");
wlr_log(WLR_ERROR, "could not start backend");
return 1;
}
@ -37,16 +37,16 @@ int main(int argc, char **argv) {
const char *socket = wl_display_add_socket_auto(server.wl_display);
if (!socket) {
wlr_log_errno(L_ERROR, "Unable to open wayland socket");
wlr_log_errno(WLR_ERROR, "Unable to open wayland socket");
wlr_backend_destroy(server.backend);
return 1;
}
wlr_log(L_INFO, "Running compositor on wayland display '%s'", socket);
wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", socket);
setenv("_WAYLAND_DISPLAY", socket, true);
if (!wlr_backend_start(server.backend)) {
wlr_log(L_ERROR, "Failed to start backend");
wlr_log(WLR_ERROR, "Failed to start backend");
wlr_backend_destroy(server.backend);
wl_display_destroy(server.wl_display);
return 1;
@ -65,7 +65,7 @@ int main(int argc, char **argv) {
const char *cmd = server.config->startup_cmd;
pid_t pid = fork();
if (pid < 0) {
wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
wlr_log(WLR_ERROR, "cannot execute binding command: fork() failed");
} else if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
}