Changeset 0464967 in mainline
- Timestamp:
- 2017-10-20T00:31:52Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 04efacc
- Parents:
- c212a03 (diff), ccbf93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- uspace
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/mkmfs/mkmfs.c
rc212a03 r0464967 348 348 unsigned int i; 349 349 uint8_t *itable_buf; 350 int rc ;350 int rc = EOK; 351 351 352 352 long itable_off = sb->zbmap_blocks + sb->ibmap_blocks + 2; … … 633 633 const unsigned int zbmap_nblocks = sb->zbmap_blocks; 634 634 unsigned int i; 635 int rc ;635 int rc = EOK; 636 636 637 637 ibmap_buf = malloc(ibmap_nblocks * sb->block_size); -
uspace/app/sbi/src/os/helenos.c
rc212a03 r0464967 155 155 size_t offset; 156 156 int i; 157 wchar_t c ;157 wchar_t c = 0; 158 158 159 159 if (index < 0) -
uspace/app/sbi/src/run_expr.c
rc212a03 r0464967 2504 2504 elem_index = 0; 2505 2505 2506 assert(node != NULL); 2507 2506 2508 i = 0; 2507 while (node != NULL){2509 do { 2508 2510 if (i >= 1) { 2509 2511 printf("Error: Too many indices string.\n"); … … 2527 2529 node = list_next(args, node); 2528 2530 i += 1; 2529 } 2531 } while (node != NULL); 2530 2532 2531 2533 if (i < 1) { -
uspace/drv/bus/pci/pciintel/pci.c
rc212a03 r0464967 293 293 const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg); 294 294 pci_bus_t *bus = pci_bus_from_fun(fun); 295 uint32_t val ;295 uint32_t val = 0; 296 296 297 297 fibril_mutex_lock(&bus->conf_mutex); -
uspace/lib/bithenge/src/compound.c
rc212a03 r0464967 81 81 82 82 *out = in; 83 return rc;83 return EOK; 84 84 } 85 85 -
uspace/lib/ext4/src/extent.c
rc212a03 r0464967 375 375 uint32_t *fblock) 376 376 { 377 int rc ;377 int rc = EOK; 378 378 /* Compute bound defined by i-node size */ 379 379 uint64_t inode_size = -
uspace/lib/trackmod/xm.c
rc212a03 r0464967 289 289 size_t instr_size; 290 290 size_t smp_size; 291 size_t smp_hdr_size ;291 size_t smp_hdr_size = 0; /* GCC false alarm on uninitialized */ 292 292 ssize_t nread; 293 293 uint8_t ltype;
Note:
See TracChangeset
for help on using the changeset viewer.