Changeset bde5c04 in mainline for uspace/srv/hid/rfb/rfb.c

Timestamp:

2017-12-04T19:32:55Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0fb1755

Parents:

8e3498b

Message:

Avoid mixing error codes and transfer sizes.

File:

• uspace/srv/hid/rfb/rfb.c (modified) (5 diffs)

uspace/srv/hid/rfb/rfb.c

@@ -418 +418 @@
 }
 
-static ssize_t rfb_tile_encode_raw(rfb_t *rfb, cpixel_ctx_t *cpixel,
+static size_t rfb_tile_encode_raw(rfb_t *rfb, cpixel_ctx_t *cpixel,
     rfb_rectangle_t *tile, void *buf)
 {
-        ssize_t size = tile->width * tile->height * cpixel->size;
+        size_t size = tile->width * tile->height * cpixel->size;
         if (buf == NULL)
                 return size;
@@ -435 +435 @@
 }
 
-static ssize_t rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
-    rfb_rectangle_t *tile, void *buf)
+static size_t rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
+    rfb_rectangle_t *tile, void *buf, size_t *size)
 {
         /* Check if it is single color */
@@ -443 +443 @@
                 for (uint16_t x = tile->x; x < tile->x + tile->width; x++) {
                         if (pixelmap_get_pixel(&rfb->framebuffer, x, y) != the_color)
-                                return -1;
+                                return EINVAL;
                 }
         }
@@ -450 +450 @@
         if (buf)
                 cpixel_encode(rfb, cpixel, buf, the_color);
-        return cpixel->size;
+        *size = cpixel->size;
+        return EOK;
 }
 
@@ -474 +475 @@
                         
                         uint8_t tile_enctype = RFB_TILE_ENCODING_SOLID;
-                        ssize_t tile_size = rfb_tile_encode_solid(rfb, &cpixel, &tile, buf);
-                        if (tile_size < 0) {
+                        size_t tile_size;
+                        int rc = rfb_tile_encode_solid(rfb, &cpixel, &tile, buf,
+                            &tile_size);
+                        if (rc != EOK) {
                                 tile_size = rfb_tile_encode_raw(rfb, &cpixel, &tile, buf);
                                 tile_enctype = RFB_TILE_ENCODING_RAW;