Changeset 18b6a88 in mainline for uspace/srv/hid

Timestamp:

2018-04-15T09:35:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

Location:

uspace/srv/hid

Files:

• compositor/compositor.c (modified) (12 diffs)
• rfb/rfb.c (modified) (12 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -488 +488 @@
                                                 if (y_bnd_ghost == y_dmg_ghost) {
                                                         for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-                                                                    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+                                                            x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x, y_dmg_ghost - vp->pos.y);
@@ -498 +498 @@
                                                 if (y_bnd_ghost + h_bnd_ghost == y_dmg_ghost + h_dmg_ghost) {
                                                         for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-                                                                    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+                                                            x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x, y_dmg_ghost - vp->pos.y + h_dmg_ghost - 1);
@@ -508 +508 @@
                                                 if (x_bnd_ghost == x_dmg_ghost) {
                                                         for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-                                                                    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+                                                            y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x_dmg_ghost - vp->pos.x, y);
@@ -518 +518 @@
                                                 if (x_bnd_ghost + w_bnd_ghost == x_dmg_ghost + w_dmg_ghost) {
                                                         for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-                                                                    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+                                                            y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x_dmg_ghost - vp->pos.x + w_dmg_ghost - 1, y);
@@ -562 +562 @@
                                                 while (count-- != 0) {
                                                         *dst = (*src & 0xff000000) ? *src : *dst;
-                                                        ++dst; ++src;
+                                                        ++dst;
+                                                        ++src;
                                                 }
                                         }
@@ -1347 +1348 @@
                         if (fy > 0) {
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-                                if (scale) win->fy *= fy;
+                                if (scale)
+                                        win->fy *= fy;
 #endif
 #if ANIMATE_WINDOW_TRANSFORMS == 1
@@ -1449 +1451 @@
 
         if (w_i == 0 || h_i == 0) {
-                rect1->x = x_u; rect2->x = 0; rect3->x = 0; rect4->x = 0;
-                rect1->y = y_u; rect2->y = 0; rect3->y = 0; rect4->y = 0;
-                rect1->w = w_u; rect2->w = 0; rect3->w = 0; rect4->w = 0;
-                rect1->h = h_u; rect2->h = 0; rect3->h = 0; rect4->h = 0;
+                rect1->x = x_u;
+                rect2->x = 0;
+                rect3->x = 0;
+                rect4->x = 0;
+
+                rect1->y = y_u;
+                rect2->y = 0;
+                rect3->y = 0;
+                rect4->y = 0;
+
+                rect1->w = w_u;
+                rect2->w = 0;
+                rect3->w = 0;
+                rect4->w = 0;
+
+                rect1->h = h_u;
+                rect2->h = 0;
+                rect3->h = 0;
+                rect4->h = 0;
         } else {
                 rect1->x = x_u;
@@ -1477 +1494 @@
 #endif
 
-static errno_t comp_abs_move(input_t *input, unsigned x , unsigned y,
+static errno_t comp_abs_move(input_t *input, unsigned x, unsigned y,
     unsigned max_x, unsigned max_y)
 {
@@ -1526 +1543 @@
         sysarg_t cursor_height;
         surface_get_resolution(pointer->cursor.states[pointer->state],
-             &cursor_width, &cursor_height);
+            &cursor_width, &cursor_height);
 
         if (pointer->pos.x + dx < viewport_bound_rect.x)
@@ -1788 +1805 @@
 
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-                comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
-                comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
-                comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
-                comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
+        comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
+        comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
+        comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
+        comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
 #endif
 
@@ -1826 +1843 @@
     keymod_t mods, wchar_t c)
 {
-        bool win_transform = (mods & KM_ALT) && (
-            key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
+        bool win_transform = (mods & KM_ALT) &&
+            (key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
             key == KC_Q || key == KC_E || key == KC_R || key == KC_F);
-        bool win_resize = (mods & KM_ALT) && (
-            key == KC_T || key == KC_G || key == KC_B || key == KC_N);
-        bool win_opacity = (mods & KM_ALT) && (
-            key == KC_C || key == KC_V);
+        bool win_resize = (mods & KM_ALT) &&
+            (key == KC_T || key == KC_G || key == KC_B || key == KC_N);
+        bool win_opacity = (mods & KM_ALT) && (key == KC_C || key == KC_V);
         bool win_close = (mods & KM_ALT) && (key == KC_X);
         bool win_switch = (mods & KM_ALT) && (key == KC_TAB);
-        bool viewport_move = (mods & KM_ALT) && (
-            key == KC_I || key == KC_K || key == KC_J || key == KC_L);
-        bool viewport_change = (mods & KM_ALT) && (
-            key == KC_O || key == KC_P);
+        bool viewport_move = (mods & KM_ALT) &&
+            (key == KC_I || key == KC_K || key == KC_J || key == KC_L);
+        bool viewport_change = (mods & KM_ALT) && (key == KC_O || key == KC_P);
         bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK);
         bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
@@ -2120 +2135 @@
                 if (filter_index == 0) {
                         filter = filter_nearest;
-                }
-                else {
+                } else {
                         filter = filter_bilinear;
                 }

uspace/srv/hid/rfb/rfb.c

@@ -83 +83 @@
 
 /** 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 +217 @@
 }
 
-__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 +236 @@
                 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 +267 @@
                 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 +289 @@
         if (rfb->pixel_format.true_color) {
                 rfb_encode_true_color(&rfb->pixel_format, buf, pixel);
-        }
-        else {
+        } else {
                 rfb_encode_index(rfb, buf, pixel);
         }
@@ -366 +360 @@
 
 typedef enum {
-        COMP_NONE, COMP_SKIP_START, COMP_SKIP_END
+        COMP_NONE,
+        COMP_SKIP_START,
+        COMP_SKIP_END
 } cpixel_compress_type_t;
 
@@ -387 +383 @@
                 if (pixel_format->big_endian) {
                         mask = host2uint32_t_be(mask);
-                }
-                else {
+                } else {
                         mask = host2uint32_t_le(mask);
                 }
@@ -396 +391 @@
                         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 +503 @@
         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 +527 @@
                 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 +575 @@
                     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 +666 @@
         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);