Use statically allocated text buffer

2 files changed, 5 insertions, 7 deletions

diff --git a/common/pango.c b/common/pango.c
index 212d96cf..2ae7883c 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -32,7 +32,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
 
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
                 int32_t scale, bool markup, const char *fmt, ...) {
-        char *buf = malloc(2048);
+        static char buf[2048];
 
         va_list args;
         va_start(args, fmt);
@@ -45,12 +45,11 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
         pango_cairo_update_layout(cairo, layout);
         pango_layout_get_pixel_size(layout, width, height);
         g_object_unref(layout);
-        free(buf);
 }
 
 void pango_printf(cairo_t *cairo, const char *font,
                 int32_t scale, bool markup, const char *fmt, ...) {
-        char *buf = malloc(2048);
+        static char buf[2048];
 
         va_list args;
         va_start(args, fmt);
@@ -63,5 +62,4 @@ void pango_printf(cairo_t *cairo, const char *font,
         pango_cairo_update_layout(cairo, layout);
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
-        free(buf);
 }
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 548106b3..ff111163 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -36,15 +36,15 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
         }
 
         // set bar id
-        int i;
-        for (i = 0; i < config->bars->length; ++i) {
+        for (int i = 0; i < config->bars->length; ++i) {
                 if (bar == config->bars->items[i]) {
                         const int len = 5 + numlen(i); // "bar-" + i + \0
                         bar->id = malloc(len * sizeof(char));
                         if (bar->id) {
                                 snprintf(bar->id, len, "bar-%d", i);
                         } else {
-                                return cmd_results_new(CMD_FAILURE, "bar", "Unable to allocate bar ID");
+                                return cmd_results_new(CMD_FAILURE,
+                                                "bar", "Unable to allocate bar ID");
                         }
                         break;
                 }