aboutsummaryrefslogtreecommitdiff
path: root/rootston/main.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-07-09 16:12:20 -0700
committerGitHub <noreply@github.com>2018-07-09 16:12:20 -0700
commit2518de655c7278728736d22549656c639e4c92f0 (patch)
treeacd08ceb9709eb25541fa02fbc533a7c6a99dbad /rootston/main.c
parente78d72f42e10b43a76ef5ba6b8c4b3b470b25245 (diff)
parent7cbef152063e1fbb24e6204339ff4587a74be04b (diff)
Merge pull request #1126 from emersion/wlr-log-prefix
util: add wlr_ prefix to log symbols
Diffstat (limited to 'rootston/main.c')
-rw-r--r--rootston/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/rootston/main.c b/rootston/main.c
index 8a0205f2..cc3ffd3e 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -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);
}