Index: uspace/srv/hid/rfb/rfb.c
===================================================================
--- uspace/srv/hid/rfb/rfb.c	(revision ad0d1f52b7cadea83fb1c6c62a810861d9933b5f)
+++ uspace/srv/hid/rfb/rfb.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -83,6 +83,6 @@
 
 /** Receive count characters (with buffering) */
-__attribute__((warn_unused_result))
-static errno_t recv_chars(tcp_conn_t *conn, char *c, size_t count)
+static errno_t __attribute__((warn_unused_result))
+recv_chars(tcp_conn_t *conn, char *c, size_t count)
 {
 	for (size_t i = 0; i < count; i++) {
@@ -217,9 +217,9 @@
 }
 
-__attribute__((warn_unused_result))
-static errno_t recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
+static errno_t __attribute__((warn_unused_result))
+recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
 {
 	memcpy(buf, &type, 1);
-	return recv_chars(conn, ((char *) buf) + 1, size -1);
+	return recv_chars(conn, ((char *) buf) + 1, size - 1);
 }
 
@@ -236,6 +236,5 @@
 		if (free && first_free_index == -1) {
 			first_free_index = i;
-		}
-		else if (!free && RED(rfb->palette[i]) == RED(pixel) &&
+		} else if (!free && RED(rfb->palette[i]) == RED(pixel) &&
 		    GREEN(rfb->palette[i]) == GREEN(pixel) &&
 		    BLUE(rfb->palette[i]) == BLUE(pixel)) {
@@ -268,20 +267,16 @@
 		uint8_t pix8 = pix;
 		memcpy(buf, &pix8, 1);
-	}
-	else if (pf->bpp == 16) {
+	} else if (pf->bpp == 16) {
 		uint16_t pix16 = pix;
 		if (pf->big_endian) {
 			pix16 = host2uint16_t_be(pix16);
-		}
-		else {
+		} else {
 			pix16 = host2uint16_t_le(pix16);
 		}
 		memcpy(buf, &pix16, 2);
-	}
-	else if (pf->bpp == 32) {
+	} else if (pf->bpp == 32) {
 		if (pf->big_endian) {
 			pix = host2uint32_t_be(pix);
-		}
-		else {
+		} else {
 			pix = host2uint32_t_le(pix);
 		}
@@ -294,6 +289,5 @@
 	if (rfb->pixel_format.true_color) {
 		rfb_encode_true_color(&rfb->pixel_format, buf, pixel);
-	}
-	else {
+	} else {
 		rfb_encode_index(rfb, buf, pixel);
 	}
@@ -366,5 +360,7 @@
 
 typedef enum {
-	COMP_NONE, COMP_SKIP_START, COMP_SKIP_END
+	COMP_NONE,
+	COMP_SKIP_START,
+	COMP_SKIP_END
 } cpixel_compress_type_t;
 
@@ -387,6 +383,5 @@
 		if (pixel_format->big_endian) {
 			mask = host2uint32_t_be(mask);
-		}
-		else {
+		} else {
 			mask = host2uint32_t_le(mask);
 		}
@@ -396,6 +391,5 @@
 			ctx->compress_type = COMP_SKIP_START;
 			ctx->size = 3;
-		}
-		else if (mask_data[3] == 0) {
+		} else if (mask_data[3] == 0) {
 			ctx->compress_type = COMP_SKIP_END;
 			ctx->size = 3;
@@ -509,6 +503,5 @@
 	size_t buf_size = sizeof(rfb_framebuffer_update_t) +
 	    sizeof(rfb_rectangle_t) * 1 +
-	    rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL)
-	    ;
+	    rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL);
 
 	void *buf = malloc(buf_size);
@@ -534,6 +527,5 @@
 		rect->enctype = RFB_ENCODING_TRLE;
 		pos += rfb_rect_encode_trle(rfb, rect, pos);
-	}
-	else {
+	} else {
 		rect->enctype = RFB_ENCODING_RAW;
 		pos += rfb_rect_encode_raw(rfb, rect, pos);
@@ -583,6 +575,5 @@
 		    pixel_format->g_max, pixel_format->g_shift, pixel_format->b_max,
 		    pixel_format->b_shift);
-	}
-	else {
+	} else {
 		if (rfb->palette == NULL) {
 			rfb->palette = malloc(sizeof(pixel_t) * 256);
@@ -675,5 +666,5 @@
 	server_init->width = rfb->width;
 	server_init->height = rfb->height;
-	server_init->pixel_format = rfb->pixel_format,
+	server_init->pixel_format = rfb->pixel_format;
 	server_init->name_length = name_length;
 	rfb_server_init_to_be(server_init, server_init);