Use static arrays where possible.

2 files changed, 13 insertions, 18 deletions

diff --git a/common/ipc-client.c b/common/ipc-client.c
index 13fd8a05..1e88e71f 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -10,7 +10,8 @@
 #include "log.h"
 
 static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
-static const size_t ipc_header_size = sizeof(ipc_magic)+8;
+
+#define IPC_HEADER_SIZE (sizeof(ipc_magic) + 8)
 
 char *get_socketpath(void) {
         const char *swaysock = getenv("SWAYSOCK");
@@ -61,12 +62,12 @@ int ipc_open_socket(const char *socket_path) {
 }
 
 struct ipc_response *ipc_recv_response(int socketfd) {
-        char *data = malloc(sizeof(char) * ipc_header_size);
+        char data[IPC_HEADER_SIZE];
         uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));
 
         size_t total = 0;
-        while (total < ipc_header_size) {
-                ssize_t received = recv(socketfd, data + total, ipc_header_size - total, 0);
+        while (total < IPC_HEADER_SIZE) {
+                ssize_t received = recv(socketfd, data + total, IPC_HEADER_SIZE - total, 0);
                 if (received <= 0) {
                         sway_abort("Unable to receive IPC response");
                 }
@@ -81,7 +82,6 @@ struct ipc_response *ipc_recv_response(int socketfd) {
         total = 0;
         memcpy(&response->size, &data32[0], sizeof(data32[0]));
         memcpy(&response->type, &data32[1], sizeof(data32[1]));
-        free(data);
 
         char *payload = malloc(response->size + 1);
         if (!payload) {
@@ -113,18 +113,16 @@ void free_ipc_response(struct ipc_response *response) {
 }
 
 char *ipc_single_command(int socketfd, uint32_t type, const char *payload, uint32_t *len) {
-        char *data = malloc(sizeof(char) * ipc_header_size);
+        char data[IPC_HEADER_SIZE];
         uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));
         memcpy(data, ipc_magic, sizeof(ipc_magic));
         memcpy(&data32[0], len, sizeof(*len));
         memcpy(&data32[1], &type, sizeof(type));
 
-        if (write(socketfd, data, ipc_header_size) == -1) {
+        if (write(socketfd, data, IPC_HEADER_SIZE) == -1) {
                 sway_abort("Unable to send IPC header");
         }
 
-        free(data);
-
         if (write(socketfd, payload, *len) == -1) {
                 sway_abort("Unable to send IPC payload");
         }
diff --git a/common/pango.c b/common/pango.c
index 18b92e9d..db8413f7 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -10,8 +10,9 @@
 #include "log.h"
 #include "stringop.h"
 
+#define MAX_CHARS 16384
+
 static const char overflow[] = "[buffer overflow]";
-static const int max_chars = 16384;
 
 size_t escape_markup_text(const char *src, char *dest) {
         size_t length = 0;
@@ -87,11 +88,11 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
 
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
                 int *baseline, double scale, bool markup, const char *fmt, ...) {
-        char *buf = malloc(sizeof(char) * max_chars);
+        char buf[MAX_CHARS];
 
         va_list args;
         va_start(args, fmt);
-        if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) {
+        if (vsnprintf(buf, sizeof(buf), fmt, args) >= MAX_CHARS) {
                 strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow);
         }
         va_end(args);
@@ -103,17 +104,15 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
                 *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
         }
         g_object_unref(layout);
-
-        free(buf);
 }
 
 void pango_printf(cairo_t *cairo, const char *font,
                 double scale, bool markup, const char *fmt, ...) {
-        char *buf = malloc(sizeof(char) * max_chars);
+        char buf[MAX_CHARS];
 
         va_list args;
         va_start(args, fmt);
-        if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) {
+        if (vsnprintf(buf, sizeof(buf), fmt, args) >= MAX_CHARS) {
                 strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow);
         }
         va_end(args);
@@ -126,6 +125,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);
 }