mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wayland: logging: replace printf by wl_log

Browse source
This commit is contained in:
Martin Minarik 2012-05-29 17:38:51 +02:00 • committed by Kristian Høgsberg
parent 8e2a786703
commit 1b6a61d3e9
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/wayland-server.c
View file

@ -437,7 +437,7 @@ wl_client_destroy(struct wl_client *client)
{ {
uint32_t serial = 0; uint32_t serial = 0;
printf("disconnect from client %p\n", client); wl_log("disconnect from client %p\n", client);
wl_signal_emit(&client->destroy_signal, client); wl_signal_emit(&client->destroy_signal, client);
@ -1016,7 +1016,7 @@ socket_data(int fd, uint32_t mask, void *data)
client_fd = wl_os_accept_cloexec(fd, (struct sockaddr *) &name, client_fd = wl_os_accept_cloexec(fd, (struct sockaddr *) &name,
&length); &length);
if (client_fd < 0) if (client_fd < 0)
fprintf(stderr, "failed to accept, errno: %d\n", errno); wl_log("failed to accept, errno: %d\n", errno);
else else
wl_client_create(display, client_fd); wl_client_create(display, client_fd);
@ -1036,15 +1036,13 @@ get_socket_lock(struct wl_socket *socket, socklen_t name_size)
(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)); (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
if (socket->fd_lock < 0) { if (socket->fd_lock < 0) {
fprintf(stderr, wl_log("unable to open lockfile %s check permissions\n",
"unable to open lockfile %s check permissions\n",
socket->lock_addr); socket->lock_addr);
return -1; return -1;
} }
if (flock(socket->fd_lock, LOCK_EX | LOCK_NB) < 0) { if (flock(socket->fd_lock, LOCK_EX | LOCK_NB) < 0) {
fprintf(stderr, wl_log("unable to lock lockfile %s, maybe another compositor is running\n",
"unable to lock lockfile %s, maybe another compositor is running\n",
socket->lock_addr); socket->lock_addr);
close(socket->fd_lock); close(socket->fd_lock);
return -1; return -1;
@ -1052,7 +1050,7 @@ get_socket_lock(struct wl_socket *socket, socklen_t name_size)
if (stat(socket->addr.sun_path, &socket_stat) < 0 ) { if (stat(socket->addr.sun_path, &socket_stat) < 0 ) {
if (errno != ENOENT) { if (errno != ENOENT) {
fprintf(stderr, "did not manage to stat file %s\n", wl_log("did not manage to stat file %s\n",
socket->addr.sun_path); socket->addr.sun_path);
close(socket->fd_lock); close(socket->fd_lock);
return -1; return -1;
@ -1085,8 +1083,7 @@ wl_display_add_socket(struct wl_display *display, const char *name)
runtime_dir = getenv("XDG_RUNTIME_DIR"); runtime_dir = getenv("XDG_RUNTIME_DIR");
if (runtime_dir == NULL) { if (runtime_dir == NULL) {
runtime_dir = "."; runtime_dir = ".";
fprintf(stderr, wl_log("XDG_RUNTIME_DIR not set, falling back to %s\n",
"XDG_RUNTIME_DIR not set, falling back to %s\n",
runtime_dir); runtime_dir);
} }
@ -1099,7 +1096,7 @@ wl_display_add_socket(struct wl_display *display, const char *name)
s->addr.sun_family = AF_LOCAL; s->addr.sun_family = AF_LOCAL;
name_size = snprintf(s->addr.sun_path, sizeof s->addr.sun_path, name_size = snprintf(s->addr.sun_path, sizeof s->addr.sun_path,
"%s/%s", runtime_dir, name) + 1; "%s/%s", runtime_dir, name) + 1;
fprintf(stderr, "using socket %s\n", s->addr.sun_path); wl_log("using socket %s\n", s->addr.sun_path);
if (get_socket_lock(s,name_size) < 0) { if (get_socket_lock(s,name_size) < 0) {
close(s->fd); close(s->fd);