aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Antonin Décimo <antonin.decimo@gmail.com>2020-06-04 15:43:42 +0200
committerLibravatar Tudor Brindus <me@tbrindus.ca>2020-07-30 22:02:42 -0400
commitbbf7b92fe4b34288dbe7c58827a1f69428ffb263 (patch)
tree2837fac64c52cb5f51cc49367a40099068374de1 /sway
parentLog empty value if envvar is not defined (diff)
downloadsway-bbf7b92fe4b34288dbe7c58827a1f69428ffb263.tar.gz
sway-bbf7b92fe4b34288dbe7c58827a1f69428ffb263.tar.zst
sway-bbf7b92fe4b34288dbe7c58827a1f69428ffb263.zip
Fix incorrect format specifiers
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/bind.c2
-rw-r--r--sway/desktop/layer_shell.c6
-rw-r--r--sway/input/libinput.c4
-rw-r--r--sway/input/seat.c2
-rw-r--r--sway/ipc-json.c2
-rw-r--r--sway/ipc-server.c2
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) {
715 struct keycode_matches matches = get_keycode_for_keysym(*keysym); 715 struct keycode_matches matches = get_keycode_for_keysym(*keysym);
716 716
717 if (matches.count != 1) { 717 if (matches.count != 1) {
718 sway_log(SWAY_INFO, "Unable to convert keysym %d into" 718 sway_log(SWAY_INFO, "Unable to convert keysym %" PRIu32 " into"
719 " a single keycode (found %d matches)", 719 " a single keycode (found %d matches)",
720 *keysym, matches.count); 720 *keysym, matches.count);
721 goto error; 721 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(
510 510
511void handle_layer_shell_surface(struct wl_listener *listener, void *data) { 511void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
512 struct wlr_layer_surface_v1 *layer_surface = data; 512 struct wlr_layer_surface_v1 *layer_surface = data;
513 sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %d " 513 sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32
514 "size %dx%d margin %d,%d,%d,%d", 514 " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",",
515 layer_surface->namespace, 515 layer_surface->namespace,
516 layer_surface->client_pending.layer, 516 layer_surface->client_pending.layer,
517 layer_surface->client_pending.layer, 517 layer_surface->client_pending.anchor,
518 layer_surface->client_pending.desired_width, 518 layer_surface->client_pending.desired_width,
519 layer_surface->client_pending.desired_height, 519 layer_surface->client_pending.desired_height,
520 layer_surface->client_pending.margin.top, 520 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) {
19 if (libinput_device_config_send_events_get_mode(device) == mode) { 19 if (libinput_device_config_send_events_get_mode(device) == mode) {
20 return false; 20 return false;
21 } 21 }
22 sway_log(SWAY_DEBUG, "send_events_set_mode(%d)", mode); 22 sway_log(SWAY_DEBUG, "send_events_set_mode(%" PRIu32 ")", mode);
23 log_status(libinput_device_config_send_events_set_mode(device, mode)); 23 log_status(libinput_device_config_send_events_set_mode(device, mode));
24 return true; 24 return true;
25} 25}
@@ -150,7 +150,7 @@ static bool set_scroll_button(struct libinput_device *dev, uint32_t button) {
150 libinput_device_config_scroll_get_button(dev) == button) { 150 libinput_device_config_scroll_get_button(dev) == button) {
151 return false; 151 return false;
152 } 152 }
153 sway_log(SWAY_DEBUG, "scroll_set_button(%d)", button); 153 sway_log(SWAY_DEBUG, "scroll_set_button(%" PRIu32 ")", button);
154 log_status(libinput_device_config_scroll_set_button(dev, button)); 154 log_status(libinput_device_config_scroll_set_button(dev, button));
155 return true; 155 return true;
156} 156}
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) {
916 916
917 if (seat == input_manager_get_default_seat()) { 917 if (seat == input_manager_get_default_seat()) {
918 char cursor_size_fmt[16]; 918 char cursor_size_fmt[16];
919 snprintf(cursor_size_fmt, sizeof(cursor_size_fmt), "%d", cursor_size); 919 snprintf(cursor_size_fmt, sizeof(cursor_size_fmt), "%u", cursor_size);
920 setenv("XCURSOR_SIZE", cursor_size_fmt, 1); 920 setenv("XCURSOR_SIZE", cursor_size_fmt, 1);
921 if (cursor_theme != NULL) { 921 if (cursor_theme != NULL) {
922 setenv("XCURSOR_THEME", cursor_theme, 1); 922 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) {
160 int major = 0, minor = 0, patch = 0; 160 int major = 0, minor = 0, patch = 0;
161 json_object *version = json_object_new_object(); 161 json_object *version = json_object_new_object();
162 162
163 sscanf(SWAY_VERSION, "%u.%u.%u", &major, &minor, &patch); 163 sscanf(SWAY_VERSION, "%d.%d.%d", &major, &minor, &patch);
164 164
165 json_object_object_add(version, "human_readable", json_object_new_string(SWAY_VERSION)); 165 json_object_object_add(version, "human_readable", json_object_new_string(SWAY_VERSION));
166 json_object_object_add(version, "variant", json_object_new_string("sway")); 166 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) {
140 dir = "/tmp"; 140 dir = "/tmp";
141 } 141 }
142 if (path_size <= snprintf(ipc_sockaddr->sun_path, path_size, 142 if (path_size <= snprintf(ipc_sockaddr->sun_path, path_size,
143 "%s/sway-ipc.%i.%i.sock", dir, getuid(), getpid())) { 143 "%s/sway-ipc.%u.%i.sock", dir, getuid(), getpid())) {
144 sway_abort("Socket path won't fit into ipc_sockaddr->sun_path"); 144 sway_abort("Socket path won't fit into ipc_sockaddr->sun_path");
145 } 145 }
146 146