diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands/bind.c | 2 | ||||
| -rw-r--r-- | sway/desktop/layer_shell.c | 6 | ||||
| -rw-r--r-- | sway/input/libinput.c | 4 | ||||
| -rw-r--r-- | sway/input/seat.c | 2 | ||||
| -rw-r--r-- | sway/ipc-json.c | 2 | ||||
| -rw-r--r-- | sway/ipc-server.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index f903f939..f6e58d99 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -715,7 +715,7 @@ bool translate_binding(struct sway_binding *binding) { struct keycode_matches matches = get_keycode_for_keysym(*keysym); if (matches.count != 1) { - sway_log(SWAY_INFO, "Unable to convert keysym %d into" + sway_log(SWAY_INFO, "Unable to convert keysym %" PRIu32 " into" " a single keycode (found %d matches)", *keysym, matches.count); goto error; diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 60a8f06b..738b1797 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -510,11 +510,11 @@ struct sway_layer_surface *layer_from_wlr_layer_surface_v1( void handle_layer_shell_surface(struct wl_listener *listener, void *data) { struct wlr_layer_surface_v1 *layer_surface = data; - sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %d " - "size %dx%d margin %d,%d,%d,%d", + sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32 + " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",", layer_surface->namespace, layer_surface->client_pending.layer, - layer_surface->client_pending.layer, + layer_surface->client_pending.anchor, layer_surface->client_pending.desired_width, layer_surface->client_pending.desired_height, layer_surface->client_pending.margin.top, diff --git a/sway/input/libinput.c b/sway/input/libinput.c index 4ec72882..108fc7b2 100644 --- a/sway/input/libinput.c +++ b/sway/input/libinput.c @@ -19,7 +19,7 @@ static bool set_send_events(struct libinput_device *device, uint32_t mode) { if (libinput_device_config_send_events_get_mode(device) == mode) { return false; } - sway_log(SWAY_DEBUG, "send_events_set_mode(%d)", mode); + sway_log(SWAY_DEBUG, "send_events_set_mode(%" PRIu32 ")", mode); log_status(libinput_device_config_send_events_set_mode(device, mode)); return true; } @@ -150,7 +150,7 @@ static bool set_scroll_button(struct libinput_device *dev, uint32_t button) { libinput_device_config_scroll_get_button(dev) == button) { return false; } - sway_log(SWAY_DEBUG, "scroll_set_button(%d)", button); + sway_log(SWAY_DEBUG, "scroll_set_button(%" PRIu32 ")", button); log_status(libinput_device_config_scroll_set_button(dev, button)); return true; } diff --git a/sway/input/seat.c b/sway/input/seat.c index bcf01962..e16d747c 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -916,7 +916,7 @@ void seat_configure_xcursor(struct sway_seat *seat) { if (seat == input_manager_get_default_seat()) { char cursor_size_fmt[16]; - snprintf(cursor_size_fmt, sizeof(cursor_size_fmt), "%d", cursor_size); + snprintf(cursor_size_fmt, sizeof(cursor_size_fmt), "%u", cursor_size); setenv("XCURSOR_SIZE", cursor_size_fmt, 1); if (cursor_theme != NULL) { setenv("XCURSOR_THEME", cursor_theme, 1); diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 70b81ad1..9330de09 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -160,7 +160,7 @@ json_object *ipc_json_get_version(void) { int major = 0, minor = 0, patch = 0; json_object *version = json_object_new_object(); - sscanf(SWAY_VERSION, "%u.%u.%u", &major, &minor, &patch); + sscanf(SWAY_VERSION, "%d.%d.%d", &major, &minor, &patch); json_object_object_add(version, "human_readable", json_object_new_string(SWAY_VERSION)); json_object_object_add(version, "variant", json_object_new_string("sway")); diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 8ba8b9ba..aad9a7b5 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -140,7 +140,7 @@ struct sockaddr_un *ipc_user_sockaddr(void) { dir = "/tmp"; } if (path_size <= snprintf(ipc_sockaddr->sun_path, path_size, - "%s/sway-ipc.%i.%i.sock", dir, getuid(), getpid())) { + "%s/sway-ipc.%u.%i.sock", dir, getuid(), getpid())) { sway_abort("Socket path won't fit into ipc_sockaddr->sun_path"); } |