From ee47a10b37ee4f049ffeedb8fd334727a13acaba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 7 Jul 2020 09:44:51 +0530
Subject: [PATCH] Simplify code a bit

---
 glfw/xkb_glfw.c  | 3 ++-
 kitty/freetype.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/glfw/xkb_glfw.c b/glfw/xkb_glfw.c
index 128988d04..ff15b29fc 100644
--- a/glfw/xkb_glfw.c
+++ b/glfw/xkb_glfw.c
@@ -508,7 +508,8 @@ format_xkb_mods(_GLFWXKBData *xkb, const char* name, xkb_mod_mask_t mods) {
     char *p = buf, *s;
 #define pr(x) { \
     int num_needed = -1; \
-    if (sizeof(buf) > (unsigned long)((p - buf) + 1)) num_needed = snprintf(p, sizeof(buf) - (p - buf) - 1, "%s", x);  \
+    ssize_t space_left = sizeof(buf) - (p - buf) - 1; \
+    if (space_left > 0) num_needed = snprintf(p, space_left, "%s", x);  \
     if (num_needed > 0) p += num_needed; \
 }
     pr(name); pr(": ");
diff --git a/kitty/freetype.c b/kitty/freetype.c
index 7d6c47363..80403a4ad 100644
--- a/kitty/freetype.c
+++ b/kitty/freetype.c
@@ -497,7 +497,7 @@ static inline bool
 render_color_bitmap(Face *self, int glyph_id, ProcessedBitmap *ans, unsigned int cell_width, unsigned int cell_height, unsigned int num_cells, unsigned int baseline) {
     (void)baseline;
     unsigned short best = 0, diff = USHRT_MAX;
-    for (short i = 0; i < (unsigned short)self->face->num_fixed_sizes; i++) {
+    for (short i = 0; i < (short)self->face->num_fixed_sizes; i++) {
         unsigned short w = self->face->available_sizes[i].width;
         unsigned short d = w > (unsigned short)cell_width ? w - (unsigned short)cell_width : (unsigned short)cell_width - w;
         if (d < diff) {