From be2635daa6b041de4dfb24952e96779a505b1b09 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 16 Aug 2015 22:16:09 -0400 Subject: [PATCH] Fix format warnings --- sway/container.c | 10 +++++----- sway/handlers.c | 4 ++-- sway/workspace.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sway/container.c b/sway/container.c index 3cf9e47a..4321b6ce 100644 --- a/sway/container.c +++ b/sway/container.c @@ -48,7 +48,7 @@ static void add_output_widths(swayc_t *container, void *_width) { swayc_t *new_output(wlc_handle handle) { const struct wlc_size* size = wlc_output_get_resolution(handle); const char *name = wlc_output_get_name(handle); - sway_log(L_DEBUG, "Added output %d %s", handle, name); + sway_log(L_DEBUG, "Added output %u %s", (unsigned int)handle, name); swayc_t *output = new_swayc(C_OUTPUT); output->width = size->w; @@ -73,7 +73,7 @@ swayc_t *new_output(wlc_handle handle) { } swayc_t *new_workspace(swayc_t * output, const char *name) { - sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle); + sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle); swayc_t *workspace = new_swayc(C_WORKSPACE); workspace->layout = L_HORIZ; // TODO:default layout @@ -127,8 +127,8 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { swayc_t *new_view(swayc_t *sibling, wlc_handle handle) { const char *title = wlc_view_get_title(handle); swayc_t *view = new_swayc(C_VIEW); - sway_log(L_DEBUG, "Adding new view %d:%s to container %p %d", - handle, title, sibling, sibling?sibling->type:0); + sway_log(L_DEBUG, "Adding new view %u:%s to container %p %d", + (unsigned int)handle, title, sibling, sibling?sibling->type:0); //Setup values view->handle = handle; view->name = strdup(title); @@ -150,7 +150,7 @@ swayc_t *destroy_output(swayc_t *output) { if (output->children->length == 0) { //TODO move workspaces to other outputs } - sway_log(L_DEBUG, "OUTPUT: Destroying output '%d'", output->handle); + sway_log(L_DEBUG, "OUTPUT: Destroying output '%u'", (unsigned int)output->handle); free_swayc(output); return &root_container; } diff --git a/sway/handlers.c b/sway/handlers.c index 9ee4f3cb..3e83b850 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -68,7 +68,7 @@ static void handle_output_destroyed(wlc_handle output) { } static void handle_output_resolution_change(wlc_handle output, const struct wlc_size *from, const struct wlc_size *to) { - sway_log(L_DEBUG, "Output %d resolution changed to %d x %d", output, to->w, to->h); + sway_log(L_DEBUG, "Output %u resolution changed to %d x %d", (unsigned int)output, to->w, to->h); swayc_t *c = get_swayc_for_handle(output, &root_container); if (!c) return; c->width = to->w; @@ -117,7 +117,7 @@ static bool handle_view_created(wlc_handle handle) { } static void handle_view_destroyed(wlc_handle handle) { - sway_log(L_DEBUG, "Destroying window %d", handle); + sway_log(L_DEBUG, "Destroying window %u", (unsigned int)handle); swayc_t *view = get_swayc_for_handle(handle, &root_container); swayc_t *parent; swayc_t *focused = get_focused_container(&root_container); diff --git a/sway/workspace.c b/sway/workspace.c index 9bc3215f..4db75f48 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -26,7 +26,7 @@ char *workspace_next_name(void) { list_t *args = split_string(command, " "); if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) { - sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", args->items[1]); + sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", (char *)args->items[1]); char* target = malloc(strlen(args->items[1]) + 1); strcpy(target, args->items[1]); while (*target == ' ' || *target == '\t')