Changeset 18b6a88 in mainline for uspace/srv
- Timestamp:
- 2018-04-15T09:35:04Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c1f44ca
- Parents:
- 8ebe212
- Location:
- uspace/srv
- Files:
-
- 14 edited
-
fs/exfat/exfat_directory.c (modified) (1 diff)
-
fs/exfat/exfat_fat.c (modified) (3 diffs)
-
fs/exfat/exfat_idx.c (modified) (6 diffs)
-
fs/exfat/exfat_ops.c (modified) (8 diffs)
-
fs/fat/fat_fat.c (modified) (4 diffs)
-
fs/fat/fat_idx.c (modified) (6 diffs)
-
fs/fat/fat_ops.c (modified) (3 diffs)
-
fs/locfs/locfs_ops.c (modified) (3 diffs)
-
fs/mfs/mfs_dentry.c (modified) (1 diff)
-
fs/mfs/mfs_ops.c (modified) (5 diffs)
-
fs/tmpfs/tmpfs_ops.c (modified) (1 diff)
-
hid/compositor/compositor.c (modified) (12 diffs)
-
hid/rfb/rfb.c (modified) (12 diffs)
-
net/udp/service.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/exfat/exfat_directory.c
r8ebe212 r18b6a88 455 455 if (i == df.file.count - 2) { 456 456 chars = ds.stream.name_size - 457 EXFAT_NAME_PART_LEN *(df.file.count - 2);457 EXFAT_NAME_PART_LEN * (df.file.count - 2); 458 458 } 459 459 -
uspace/srv/fs/exfat/exfat_fat.c
r8ebe212 r18b6a88 142 142 */ 143 143 return block_get(block, nodep->idx->service_id, DATA_FS(bs) + 144 (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) +144 (nodep->lastc_cached_value - EXFAT_CLST_FIRST) * SPC(bs) + 145 145 (bn % SPC(bs)), flags); 146 146 } … … 201 201 if (!fragmented) { 202 202 rc = block_get(block, service_id, DATA_FS(bs) + 203 (fcl - EXFAT_CLST_FIRST) *SPC(bs) + bn, flags);203 (fcl - EXFAT_CLST_FIRST) * SPC(bs) + bn, flags); 204 204 } else { 205 205 max_clusters = bn / SPC(bs); … … 514 514 block_t *b; 515 515 errno_t rc; 516 blocks = ROUND_UP(nodep->size, BPS(bs)) /BPS(bs);516 blocks = ROUND_UP(nodep->size, BPS(bs)) / BPS(bs); 517 517 count = BPS(bs); 518 518 -
uspace/srv/fs/exfat/exfat_idx.c
r8ebe212 r18b6a88 119 119 static inline size_t pos_key_hash(void *key) 120 120 { 121 pos_key_t *pos = (pos_key_t *)key;121 pos_key_t *pos = (pos_key_t *)key; 122 122 123 123 size_t hash = 0; … … 141 141 static bool pos_key_equal(void *key, const ht_link_t *item) 142 142 { 143 pos_key_t *pos = (pos_key_t *)key;143 pos_key_t *pos = (pos_key_t *)key; 144 144 exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link); 145 145 146 return pos->service_id == fidx->service_id 147 && pos->pdi == fidx->pdi148 &&pos->pfc == fidx->pfc;146 return pos->service_id == fidx->service_id && 147 pos->pdi == fidx->pdi && 148 pos->pfc == fidx->pfc; 149 149 } 150 150 … … 170 170 static size_t idx_key_hash(void *key_arg) 171 171 { 172 idx_key_t *key = (idx_key_t *)key_arg;172 idx_key_t *key = (idx_key_t *)key_arg; 173 173 return hash_combine(key->service_id, key->index); 174 174 } … … 183 183 { 184 184 exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link); 185 idx_key_t *key = (idx_key_t *)key_arg;185 idx_key_t *key = (idx_key_t *)key_arg; 186 186 187 187 return key->index == fidx->index && key->service_id == fidx->service_id; … … 509 509 static bool rm_pos_service_id(ht_link_t *item, void *arg) 510 510 { 511 service_id_t service_id = *(service_id_t *)arg;511 service_id_t service_id = *(service_id_t *)arg; 512 512 exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link); 513 513 … … 521 521 static bool rm_idx_service_id(ht_link_t *item, void *arg) 522 522 { 523 service_id_t service_id = *(service_id_t *)arg;523 service_id_t service_id = *(service_id_t *)arg; 524 524 exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link); 525 525 -
uspace/srv/fs/exfat/exfat_ops.c
r8ebe212 r18b6a88 248 248 fn = FS_NODE(nodep); 249 249 } else { 250 skip_cache:250 skip_cache: 251 251 /* Try to allocate a new node structure. */ 252 252 fibril_mutex_unlock(&ffn_mutex); … … 533 533 (BPS(di.bs) / sizeof(exfat_dentry_t)); 534 534 exfat_idx_t *idx = exfat_idx_get_by_pos(service_id, 535 parentp->firstc, di.bnum * DPS(di.bs) + o);535 parentp->firstc, di.bnum * DPS(di.bs) + o); 536 536 if (!idx) { 537 537 /* … … 706 706 if (nodep->fragmented) 707 707 rc = exfat_free_clusters(bs, nodep->idx->service_id, 708 nodep->firstc);708 nodep->firstc); 709 709 else 710 710 rc = exfat_bitmap_free_clusters(bs, nodep, … … 805 805 806 806 exfat_directory_t di; 807 rc = exfat_directory_open(parentp, &di);807 rc = exfat_directory_open(parentp, &di); 808 808 if (rc != EOK) 809 809 goto error; … … 1062 1062 rc = exfat_node_get_new_by_pos(&rootp, service_id, EXFAT_ROOT_PAR, 1063 1063 EXFAT_ROOT_POS); 1064 if (rc !=EOK) {1064 if (rc != EOK) { 1065 1065 (void) block_cache_fini(service_id); 1066 1066 block_fini(service_id); … … 1183 1183 block_fini(service_id); 1184 1184 exfat_idx_fini_by_service_id(service_id); 1185 return ENOTSUP;1185 return ENOTSUP; 1186 1186 } 1187 1187 } … … 1409 1409 (void) exfat_directory_close(&di); 1410 1410 1411 err:1411 err: 1412 1412 (void) exfat_node_put(fn); 1413 1413 async_answer_0(chandle, rc); 1414 1414 return rc; 1415 1415 1416 miss:1416 miss: 1417 1417 rc = exfat_directory_close(&di); 1418 1418 if (rc != EOK) … … 1423 1423 return rc != EOK ? rc : ENOENT; 1424 1424 1425 hit:1425 hit: 1426 1426 pos = di.pos; 1427 1427 rc = exfat_directory_close(&di); -
uspace/srv/fs/fat/fat_fat.c
r8ebe212 r18b6a88 249 249 for (o = nodep->size; o < pos && o < boundary; 250 250 o = ALIGN_DOWN(o + BPS(bs), BPS(bs))) { 251 int flags = (o % BPS(bs) == 0) ?251 int flags = (o % BPS(bs) == 0) ? 252 252 BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE; 253 253 rc = fat_block_get(&b, bs, nodep, o / BPS(bs), flags); … … 324 324 * first byte of next sector 325 325 */ 326 byte2 = ((uint8_t *) b1->data)[0];326 byte2 = ((uint8_t *) b1->data)[0]; 327 327 328 328 rc = block_put(b1); … … 469 469 return rc; 470 470 471 byte1 = ((uint8_t *) b->data)[offset % BPS(bs)];471 byte1 = ((uint8_t *) b->data)[offset % BPS(bs)]; 472 472 bool border = false; 473 473 /* This cluster access spans a sector boundary. */ … … 495 495 } 496 496 } else 497 byte2 = ((uint8_t *) b->data)[(offset % BPS(bs)) + 1];497 byte2 = ((uint8_t *) b->data)[(offset % BPS(bs)) + 1]; 498 498 499 499 if (IS_ODD(clst)) { -
uspace/srv/fs/fat/fat_idx.c
r8ebe212 r18b6a88 119 119 static inline size_t pos_key_hash(void *key) 120 120 { 121 pos_key_t *pos = (pos_key_t *)key;121 pos_key_t *pos = (pos_key_t *)key; 122 122 123 123 size_t hash = 0; … … 141 141 static bool pos_key_equal(void *key, const ht_link_t *item) 142 142 { 143 pos_key_t *pos = (pos_key_t *)key;143 pos_key_t *pos = (pos_key_t *)key; 144 144 fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link); 145 145 146 return pos->service_id == fidx->service_id 147 && pos->pdi == fidx->pdi148 &&pos->pfc == fidx->pfc;146 return pos->service_id == fidx->service_id && 147 pos->pdi == fidx->pdi && 148 pos->pfc == fidx->pfc; 149 149 } 150 150 … … 170 170 static size_t idx_key_hash(void *key_arg) 171 171 { 172 idx_key_t *key = (idx_key_t *)key_arg;172 idx_key_t *key = (idx_key_t *)key_arg; 173 173 return hash_combine(key->service_id, key->index); 174 174 } … … 183 183 { 184 184 fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link); 185 idx_key_t *key = (idx_key_t *)key_arg;185 idx_key_t *key = (idx_key_t *)key_arg; 186 186 187 187 return key->index == fidx->index && key->service_id == fidx->service_id; … … 508 508 static bool rm_pos_service_id(ht_link_t *item, void *arg) 509 509 { 510 service_id_t service_id = *(service_id_t *)arg;510 service_id_t service_id = *(service_id_t *)arg; 511 511 fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link); 512 512 … … 520 520 static bool rm_idx_service_id(ht_link_t *item, void *arg) 521 521 { 522 service_id_t service_id = *(service_id_t *)arg;522 service_id_t service_id = *(service_id_t *)arg; 523 523 fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link); 524 524 -
uspace/srv/fs/fat/fat_ops.c
r8ebe212 r18b6a88 241 241 fn = FS_NODE(nodep); 242 242 } else { 243 skip_cache:243 skip_cache: 244 244 /* Try to allocate a new node structure. */ 245 245 fibril_mutex_unlock(&ffn_mutex); … … 1289 1289 goto miss; 1290 1290 1291 err:1291 err: 1292 1292 (void) fat_node_put(fn); 1293 1293 async_answer_0(chandle, rc); 1294 1294 return rc; 1295 1295 1296 miss:1296 miss: 1297 1297 rc = fat_directory_close(&di); 1298 1298 if (rc != EOK) … … 1303 1303 return rc != EOK ? rc : ENOENT; 1304 1304 1305 hit:1305 hit: 1306 1306 pos = di.pos; 1307 1307 rc = fat_directory_close(&di); -
uspace/srv/fs/locfs/locfs_ops.c
r8ebe212 r18b6a88 73 73 static size_t services_key_hash(void *key) 74 74 { 75 return *(service_id_t *)key;75 return *(service_id_t *)key; 76 76 } 77 77 … … 85 85 { 86 86 service_t *dev = hash_table_get_inst(item, service_t, link); 87 return (dev->service_id == *(service_id_t *)key);87 return (dev->service_id == *(service_id_t *)key); 88 88 } 89 89 … … 234 234 fibril_mutex_lock(&services_mutex); 235 235 ht_link_t *lnk; 236 restart:236 restart: 237 237 lnk = hash_table_find(&services, &node->service_id); 238 238 if (lnk == NULL) { -
uspace/srv/fs/mfs/mfs_dentry.c
r8ebe212 r18b6a88 171 171 /* Search the directory entry to be removed */ 172 172 unsigned i; 173 for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {173 for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) { 174 174 r = mfs_read_dentry(mnode, &d_info, i); 175 175 if (r != EOK) -
uspace/srv/fs/mfs/mfs_ops.c
r8ebe212 r18b6a88 103 103 open_nodes_key_hash(void *key) 104 104 { 105 node_key_t *node_key = (node_key_t *)key;105 node_key_t *node_key = (node_key_t *)key; 106 106 return hash_combine(node_key->service_id, node_key->index); 107 107 } … … 117 117 open_nodes_key_equal(void *key, const ht_link_t *item) 118 118 { 119 node_key_t *node_key = (node_key_t *)key;119 node_key_t *node_key = (node_key_t *)key; 120 120 struct mfs_node *mnode = hash_table_get_inst(item, struct mfs_node, link); 121 121 122 return node_key->service_id == mnode->instance->service_id 123 &&node_key->index == mnode->ino_i->index;122 return node_key->service_id == mnode->instance->service_id && 123 node_key->index == mnode->ino_i->index; 124 124 } 125 125 … … 361 361 if (sbi) 362 362 free(sbi); 363 if (instance)363 if (instance) 364 364 free(instance); 365 365 return rc; … … 871 871 async_answer_0(chandle, rc != EOK ? rc : ENOENT); 872 872 return rc; 873 found:873 found: 874 874 async_data_read_finalize(chandle, d_info.d_name, 875 875 str_size(d_info.d_name) + 1); … … 1102 1102 static bool 1103 1103 check_magic_number(uint16_t magic, bool *native, 1104 mfs_version_t *version, bool *longfilenames)1104 mfs_version_t *version, bool *longfilenames) 1105 1105 { 1106 1106 bool rc = true; -
uspace/srv/fs/tmpfs/tmpfs_ops.c
r8ebe212 r18b6a88 238 238 static bool rm_service_id_nodes(ht_link_t *item, void *arg) 239 239 { 240 service_id_t sid = *(service_id_t *)arg;240 service_id_t sid = *(service_id_t *)arg; 241 241 tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link); 242 242 -
uspace/srv/hid/compositor/compositor.c
r8ebe212 r18b6a88 488 488 if (y_bnd_ghost == y_dmg_ghost) { 489 489 for (sysarg_t x = x_dmg_ghost - vp->pos.x; 490 x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {490 x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) { 491 491 ghost_color = surface_get_pixel(vp->surface, 492 492 x, y_dmg_ghost - vp->pos.y); … … 498 498 if (y_bnd_ghost + h_bnd_ghost == y_dmg_ghost + h_dmg_ghost) { 499 499 for (sysarg_t x = x_dmg_ghost - vp->pos.x; 500 x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {500 x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) { 501 501 ghost_color = surface_get_pixel(vp->surface, 502 502 x, y_dmg_ghost - vp->pos.y + h_dmg_ghost - 1); … … 508 508 if (x_bnd_ghost == x_dmg_ghost) { 509 509 for (sysarg_t y = y_dmg_ghost - vp->pos.y; 510 y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {510 y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) { 511 511 ghost_color = surface_get_pixel(vp->surface, 512 512 x_dmg_ghost - vp->pos.x, y); … … 518 518 if (x_bnd_ghost + w_bnd_ghost == x_dmg_ghost + w_dmg_ghost) { 519 519 for (sysarg_t y = y_dmg_ghost - vp->pos.y; 520 y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {520 y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) { 521 521 ghost_color = surface_get_pixel(vp->surface, 522 522 x_dmg_ghost - vp->pos.x + w_dmg_ghost - 1, y); … … 562 562 while (count-- != 0) { 563 563 *dst = (*src & 0xff000000) ? *src : *dst; 564 ++dst; ++src; 564 ++dst; 565 ++src; 565 566 } 566 567 } … … 1347 1348 if (fy > 0) { 1348 1349 #if ANIMATE_WINDOW_TRANSFORMS == 0 1349 if (scale) win->fy *= fy; 1350 if (scale) 1351 win->fy *= fy; 1350 1352 #endif 1351 1353 #if ANIMATE_WINDOW_TRANSFORMS == 1 … … 1449 1451 1450 1452 if (w_i == 0 || h_i == 0) { 1451 rect1->x = x_u; rect2->x = 0; rect3->x = 0; rect4->x = 0; 1452 rect1->y = y_u; rect2->y = 0; rect3->y = 0; rect4->y = 0; 1453 rect1->w = w_u; rect2->w = 0; rect3->w = 0; rect4->w = 0; 1454 rect1->h = h_u; rect2->h = 0; rect3->h = 0; rect4->h = 0; 1453 rect1->x = x_u; 1454 rect2->x = 0; 1455 rect3->x = 0; 1456 rect4->x = 0; 1457 1458 rect1->y = y_u; 1459 rect2->y = 0; 1460 rect3->y = 0; 1461 rect4->y = 0; 1462 1463 rect1->w = w_u; 1464 rect2->w = 0; 1465 rect3->w = 0; 1466 rect4->w = 0; 1467 1468 rect1->h = h_u; 1469 rect2->h = 0; 1470 rect3->h = 0; 1471 rect4->h = 0; 1455 1472 } else { 1456 1473 rect1->x = x_u; … … 1477 1494 #endif 1478 1495 1479 static errno_t comp_abs_move(input_t *input, unsigned x , unsigned y,1496 static errno_t comp_abs_move(input_t *input, unsigned x, unsigned y, 1480 1497 unsigned max_x, unsigned max_y) 1481 1498 { … … 1526 1543 sysarg_t cursor_height; 1527 1544 surface_get_resolution(pointer->cursor.states[pointer->state], 1528 &cursor_width, &cursor_height);1545 &cursor_width, &cursor_height); 1529 1546 1530 1547 if (pointer->pos.x + dx < viewport_bound_rect.x) … … 1788 1805 1789 1806 #if ANIMATE_WINDOW_TRANSFORMS == 0 1790 comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);1791 comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);1792 comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);1793 comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);1807 comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h); 1808 comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h); 1809 comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h); 1810 comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h); 1794 1811 #endif 1795 1812 … … 1826 1843 keymod_t mods, wchar_t c) 1827 1844 { 1828 bool win_transform = (mods & KM_ALT) && (1829 key == KC_W || key == KC_S || key == KC_A || key == KC_D ||1845 bool win_transform = (mods & KM_ALT) && 1846 (key == KC_W || key == KC_S || key == KC_A || key == KC_D || 1830 1847 key == KC_Q || key == KC_E || key == KC_R || key == KC_F); 1831 bool win_resize = (mods & KM_ALT) && ( 1832 key == KC_T || key == KC_G || key == KC_B || key == KC_N); 1833 bool win_opacity = (mods & KM_ALT) && ( 1834 key == KC_C || key == KC_V); 1848 bool win_resize = (mods & KM_ALT) && 1849 (key == KC_T || key == KC_G || key == KC_B || key == KC_N); 1850 bool win_opacity = (mods & KM_ALT) && (key == KC_C || key == KC_V); 1835 1851 bool win_close = (mods & KM_ALT) && (key == KC_X); 1836 1852 bool win_switch = (mods & KM_ALT) && (key == KC_TAB); 1837 bool viewport_move = (mods & KM_ALT) && ( 1838 key == KC_I || key == KC_K || key == KC_J || key == KC_L); 1839 bool viewport_change = (mods & KM_ALT) && ( 1840 key == KC_O || key == KC_P); 1853 bool viewport_move = (mods & KM_ALT) && 1854 (key == KC_I || key == KC_K || key == KC_J || key == KC_L); 1855 bool viewport_change = (mods & KM_ALT) && (key == KC_O || key == KC_P); 1841 1856 bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK); 1842 1857 bool filter_switch = (mods & KM_ALT) && (key == KC_Y); … … 2120 2135 if (filter_index == 0) { 2121 2136 filter = filter_nearest; 2122 } 2123 else { 2137 } else { 2124 2138 filter = filter_bilinear; 2125 2139 } -
uspace/srv/hid/rfb/rfb.c
r8ebe212 r18b6a88 83 83 84 84 /** Receive count characters (with buffering) */ 85 __attribute__((warn_unused_result))86 static errno_trecv_chars(tcp_conn_t *conn, char *c, size_t count)85 static errno_t __attribute__((warn_unused_result)) 86 recv_chars(tcp_conn_t *conn, char *c, size_t count) 87 87 { 88 88 for (size_t i = 0; i < count; i++) { … … 217 217 } 218 218 219 __attribute__((warn_unused_result))220 static errno_trecv_message(tcp_conn_t *conn, char type, void *buf, size_t size)219 static errno_t __attribute__((warn_unused_result)) 220 recv_message(tcp_conn_t *conn, char type, void *buf, size_t size) 221 221 { 222 222 memcpy(buf, &type, 1); 223 return recv_chars(conn, ((char *) buf) + 1, size - 1);223 return recv_chars(conn, ((char *) buf) + 1, size - 1); 224 224 } 225 225 … … 236 236 if (free && first_free_index == -1) { 237 237 first_free_index = i; 238 } 239 else if (!free && RED(rfb->palette[i]) == RED(pixel) && 238 } else if (!free && RED(rfb->palette[i]) == RED(pixel) && 240 239 GREEN(rfb->palette[i]) == GREEN(pixel) && 241 240 BLUE(rfb->palette[i]) == BLUE(pixel)) { … … 268 267 uint8_t pix8 = pix; 269 268 memcpy(buf, &pix8, 1); 270 } 271 else if (pf->bpp == 16) { 269 } else if (pf->bpp == 16) { 272 270 uint16_t pix16 = pix; 273 271 if (pf->big_endian) { 274 272 pix16 = host2uint16_t_be(pix16); 275 } 276 else { 273 } else { 277 274 pix16 = host2uint16_t_le(pix16); 278 275 } 279 276 memcpy(buf, &pix16, 2); 280 } 281 else if (pf->bpp == 32) { 277 } else if (pf->bpp == 32) { 282 278 if (pf->big_endian) { 283 279 pix = host2uint32_t_be(pix); 284 } 285 else { 280 } else { 286 281 pix = host2uint32_t_le(pix); 287 282 } … … 294 289 if (rfb->pixel_format.true_color) { 295 290 rfb_encode_true_color(&rfb->pixel_format, buf, pixel); 296 } 297 else { 291 } else { 298 292 rfb_encode_index(rfb, buf, pixel); 299 293 } … … 366 360 367 361 typedef enum { 368 COMP_NONE, COMP_SKIP_START, COMP_SKIP_END 362 COMP_NONE, 363 COMP_SKIP_START, 364 COMP_SKIP_END 369 365 } cpixel_compress_type_t; 370 366 … … 387 383 if (pixel_format->big_endian) { 388 384 mask = host2uint32_t_be(mask); 389 } 390 else { 385 } else { 391 386 mask = host2uint32_t_le(mask); 392 387 } … … 396 391 ctx->compress_type = COMP_SKIP_START; 397 392 ctx->size = 3; 398 } 399 else if (mask_data[3] == 0) { 393 } else if (mask_data[3] == 0) { 400 394 ctx->compress_type = COMP_SKIP_END; 401 395 ctx->size = 3; … … 509 503 size_t buf_size = sizeof(rfb_framebuffer_update_t) + 510 504 sizeof(rfb_rectangle_t) * 1 + 511 rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL) 512 ; 505 rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL); 513 506 514 507 void *buf = malloc(buf_size); … … 534 527 rect->enctype = RFB_ENCODING_TRLE; 535 528 pos += rfb_rect_encode_trle(rfb, rect, pos); 536 } 537 else { 529 } else { 538 530 rect->enctype = RFB_ENCODING_RAW; 539 531 pos += rfb_rect_encode_raw(rfb, rect, pos); … … 583 575 pixel_format->g_max, pixel_format->g_shift, pixel_format->b_max, 584 576 pixel_format->b_shift); 585 } 586 else { 577 } else { 587 578 if (rfb->palette == NULL) { 588 579 rfb->palette = malloc(sizeof(pixel_t) * 256); … … 675 666 server_init->width = rfb->width; 676 667 server_init->height = rfb->height; 677 server_init->pixel_format = rfb->pixel_format ,668 server_init->pixel_format = rfb->pixel_format; 678 669 server_init->name_length = name_length; 679 670 rfb_server_init_to_be(server_init, server_init); -
uspace/srv/net/udp/service.c
r8ebe212 r18b6a88 359 359 * @param icall Async request data 360 360 */ 361 static 362 voidudp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,361 static void 362 udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle, 363 363 ipc_call_t *icall) 364 364 {
Note:
See TracChangeset
for help on using the changeset viewer.
