Merge branch 'master' into next

[i3/i3] / libi3 / ipc_send_message.c

diff --git a/libi3/ipc_send_message.c b/libi3/ipc_send_message.c
index c5560c0de9789aef20e27ec667cfd36c7ce0464a..28cb8359207e128b648a664824b6dcc59950e07e 100644 (file)
--- a/libi3/ipc_send_message.c
+++ b/libi3/ipc_send_message.c
@@ -28,19 +28,18 @@ int ipc_send_message(int sockfd, const uint32_t message_size,
                      const uint32_t message_type, const uint8_t *payload) {
     const i3_ipc_header_t header = {
         /* We don’t use I3_IPC_MAGIC because it’s a 0-terminated C string. */
-        .magic = { 'i', '3', '-', 'i', 'p', 'c' },
+        .magic = {'i', '3', '-', 'i', 'p', 'c'},
         .size = message_size,
-        .type = message_type
-    };
+        .type = message_type};
 
-    int sent_bytes = 0;
+    size_t sent_bytes = 0;
     int n = 0;
 
     /* This first loop is basically unnecessary. No operating system has
      * buffers which cannot fit 14 bytes into them, so the write() will only be
      * called once. */
     while (sent_bytes < sizeof(i3_ipc_header_t)) {
-        if ((n = write(sockfd, ((void*)&header) + sent_bytes, sizeof(i3_ipc_header_t) - sent_bytes)) == -1) {
+        if ((n = write(sockfd, ((void *)&header) + sent_bytes, sizeof(i3_ipc_header_t) - sent_bytes)) == -1) {
             if (errno == EAGAIN)
                 continue;
             return -1;