diff options
-rw-r--r-- | common/log.c | 2 | ||||
-rw-r--r-- | sway/commands.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/log.c b/common/log.c index 0c0ecf89..adba0021 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -171,7 +171,7 @@ void error_handler(int sig) { | |||
171 | sway_log(L_ERROR, "Unable to allocate memory to show maps"); | 171 | sway_log(L_ERROR, "Unable to allocate memory to show maps"); |
172 | break; | 172 | break; |
173 | } | 173 | } |
174 | sway_log(L_ERROR, m); | 174 | sway_log(L_ERROR, "%s", m); |
175 | } | 175 | } |
176 | fclose(maps); | 176 | fclose(maps); |
177 | } | 177 | } |
diff --git a/sway/commands.c b/sway/commands.c index b8af0d06..6a93c84a 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -870,8 +870,8 @@ static struct cmd_results *cmd_move(int argc, char **argv) { | |||
870 | uint32_t w = size->w - g.size.w; | 870 | uint32_t w = size->w - g.size.w; |
871 | uint32_t h = size->h - g.size.h; | 871 | uint32_t h = size->h - g.size.h; |
872 | 872 | ||
873 | view->x = g.origin.x = MIN(w, MAX(x, 0)); | 873 | view->x = g.origin.x = MIN((int32_t)w, MAX(x, 0)); |
874 | view->y = g.origin.y = MIN(h, MAX(y, 0)); | 874 | view->y = g.origin.y = MIN((int32_t)h, MAX(y, 0)); |
875 | 875 | ||
876 | wlc_view_set_geometry(view->handle, 0, &g); | 876 | wlc_view_set_geometry(view->handle, 0, &g); |
877 | } | 877 | } |