Changeset 8565a42 in mainline for uspace/lib/block

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/lib/block/block.c (modified) (25 diffs)

uspace/lib/block/block.c

@@ -95 +95 @@
 {
         fibril_mutex_lock(&dcl_lock);
-        
+
         list_foreach(dcl, link, devcon_t, devcon) {
                 if (devcon->service_id == service_id) {
@@ -102 +102 @@
                 }
         }
-        
+
         fibril_mutex_unlock(&dcl_lock);
         return NULL;
@@ -111 +111 @@
 {
         devcon_t *devcon;
-        
+
         devcon = malloc(sizeof(devcon_t));
         if (!devcon)
                 return ENOMEM;
-        
+
         link_initialize(&devcon->link);
         devcon->service_id = service_id;
@@ -125 +125 @@
         devcon->pblocks = dev_size;
         devcon->cache = NULL;
-        
+
         fibril_mutex_lock(&dcl_lock);
         list_foreach(dcl, link, devcon_t, d) {
@@ -155 +155 @@
                 return ENOENT;
         }
-        
+
         errno_t rc = bd_open(sess, &bd);
         if (rc != EOK) {
@@ -161 +161 @@
                 return rc;
         }
-        
+
         size_t bsize;
         rc = bd_get_block_size(bd, &bsize);
@@ -177 +177 @@
                 return rc;
         }
-        
+
         rc = devcon_add(service_id, sess, bsize, dev_size, bd);
         if (rc != EOK) {
@@ -184 +184 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -192 +192 @@
         devcon_t *devcon = devcon_search(service_id);
         assert(devcon);
-        
+
         if (devcon->cache)
                 (void) block_cache_fini(service_id);
-        
+
         (void)bd_sync_cache(devcon->bd, 0, 0);
-        
+
         devcon_remove(devcon);
-        
+
         if (devcon->bb_buf)
                 free(devcon->bb_buf);
-        
+
         bd_close(devcon->bd);
         async_hangup(devcon->sess);
-        
+
         free(devcon);
 }
@@ -282 +282 @@
         if (!cache)
                 return ENOMEM;
-        
+
         fibril_mutex_initialize(&cache->lock);
         list_initialize(&cache->free_list);
@@ -318 +318 @@
                 return EOK;
         cache = devcon->cache;
-        
+
         /*
          * We are expecting to find all blocks for this device handle on the
@@ -337 +337 @@
 
                 hash_table_remove_item(&cache->block_hash, &b->hash_link);
-                
+
                 free(b->data);
                 free(b);
@@ -391 +391 @@
         aoff64_t p_ba;
         errno_t rc;
-        
+
         devcon = devcon_search(service_id);
 
         assert(devcon);
         assert(devcon->cache);
-        
+
         cache = devcon->cache;
 
@@ -712 +712 @@
         assert(devcon);
         block_size = devcon->pblock_size;
-        
+
         while (left > 0) {
                 size_t rd;
-                
+
                 if (*bufpos + left < *buflen)
                         rd = left;
                 else
                         rd = *buflen - *bufpos;
-                
+
                 if (rd > 0) {
                         /*
@@ -732 +732 @@
                         left -= rd;
                 }
-                
+
                 if (*bufpos == *buflen) {
                         /* Refill the communication buffer with a new block. */
@@ -742 +742 @@
                                 return rc;
                         }
-                        
+
                         *bufpos = 0;
                         *buflen = block_size;
                 }
         }
-        
+
         return EOK;
 }
@@ -860 +860 @@
         size_t blocks;
         size_t offset;
-        
+
         rc = block_get_bsize(service_id, &phys_block_size);
         if (rc != EOK) {
                 return rc;
         }
-        
+
         /* calculate data position and required space */
         first_block = abs_offset / phys_block_size;
@@ -872 +872 @@
         blocks = last_block - first_block + 1;
         buf_size = blocks * phys_block_size;
-        
+
         /* read the data into memory */
         buffer = malloc(buf_size);
@@ -878 +878 @@
                 return ENOMEM;
         }
-        
+
         rc = block_read_direct(service_id, first_block, blocks, buffer);
         if (rc != EOK) {
@@ -884 +884 @@
                 return rc;
         }
-        
+
         /* copy the data from the buffer */
         memcpy(data, buffer + offset, bytes);
         free(buffer);
-        
+
         return EOK;
 }
@@ -905 +905 @@
 {
         devcon_t *devcon = devcon_search(service_id);
-        
+
         assert(devcon);
         return bd_read_toc(devcon->bd, session, buf, bufsize);
@@ -923 +923 @@
 {
         assert(devcon);
-        
+
         errno_t rc = bd_read_blocks(devcon->bd, ba, cnt, buf, size);
         if (rc != EOK) {
@@ -933 +933 @@
 #endif
         }
-        
+
         return rc;
 }
@@ -950 +950 @@
 {
         assert(devcon);
-        
+
         errno_t rc = bd_write_blocks(devcon->bd, ba, cnt, data, size);
         if (rc != EOK) {
@@ -959 +959 @@
 #endif
         }
-        
+
         return rc;
 }