Changeset a35b458 in mainline for uspace/app/tester/mm/common.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/app/tester/mm/common.c (modified) (19 diffs)

uspace/app/tester/mm/common.c

@@ -72 +72 @@
 {
         link_t *link;
-        
+
         while ((link = list_first(&mem_blocks)) != NULL) {
                 mem_block_t *block = list_get_instance(link, mem_block_t, link);
                 free_block(block);
         }
-        
+
         while ((link = list_first(&mem_areas)) != NULL) {
                 mem_area_t *area = list_get_instance(link, mem_area_t, link);
@@ -89 +89 @@
         uint8_t *mbeg = (uint8_t *) block;
         uint8_t *mend = (uint8_t *) block + sizeof(mem_block_t);
-        
+
         /* Entry block memory <bbeg, bend) */
         uint8_t *bbeg = (uint8_t *) block->addr;
         uint8_t *bend = (uint8_t *) block->addr + block->size;
-        
+
         /* Data block <dbeg, dend) */
         uint8_t *dbeg = (uint8_t *) addr;
         uint8_t *dend = (uint8_t *) addr + size;
-        
+
         /* Check for overlaps */
         if (((mbeg >= dbeg) && (mbeg < dend)) ||
@@ -104 +104 @@
             ((bend > dbeg) && (bend <= dend)))
                 return true;
-        
+
         return false;
 }
@@ -122 +122 @@
 {
         bool fnd = false;
-        
+
         list_foreach(mem_blocks, link, mem_block_t, block) {
                 if (overlap_match(block, addr, size)) {
@@ -129 +129 @@
                 }
         }
-        
+
         return fnd;
 }
@@ -160 +160 @@
 {
         void *data;
-        
+
         /* Allocate the chunk of memory */
         data = malloc(size);
@@ -166 +166 @@
         if (data == NULL)
                 return NULL;
-        
+
         /* Check for overlaps with other chunks */
         if (test_overlap(data, size)) {
@@ -174 +174 @@
                 error_flag = true;
         }
-        
+
         return data;
 }
@@ -197 +197 @@
         if (mem_allocated >= MAX_ALLOC)
                 return NULL;
-        
+
         /* Allocate the block holder */
         mem_block_t *block =
@@ -203 +203 @@
         if (block == NULL)
                 return NULL;
-        
+
         link_initialize(&block->link);
-        
+
         /* Allocate the block memory */
         block->addr = checked_malloc(size);
@@ -213 +213 @@
                 return NULL;
         }
-        
+
         block->size = size;
-        
+
         /* Register the allocated block */
         list_append(&block->link, &mem_blocks);
         mem_allocated += size + sizeof(mem_block_t);
         mem_blocks_count++;
-        
+
         return block;
 }
@@ -238 +238 @@
         mem_allocated -= block->size + sizeof(mem_block_t);
         mem_blocks_count--;
-        
+
         /* Free the memory */
         free(block->addr);
@@ -272 +272 @@
             pos < end; pos++)
                 *pos = block_expected_value(block, pos);
-        
+
         check_consistency("fill_block");
 }
@@ -308 +308 @@
         if (mem_blocks_count == 0)
                 return NULL;
-        
+
         unsigned long idx = rand() % mem_blocks_count;
         link_t *entry = list_nth(&mem_blocks, idx);
-        
+
         if (entry == NULL) {
                 TPRINTF("\nError: Corrupted list of allocated memory blocks.\n");
@@ -317 +317 @@
                 error_flag = true;
         }
-        
+
         return list_get_instance(entry, mem_block_t, link);
 }
@@ -337 +337 @@
         if (area == NULL)
                 return NULL;
-        
+
         link_initialize(&area->link);
-        
+
         area->addr = as_area_create(AS_AREA_ANY, size,
             AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE,
@@ -348 +348 @@
                 return NULL;
         }
-        
+
         area->size = size;
-        
+
         /* Register the allocated area */
         list_append(&area->link, &mem_areas);
-        
+
         return area;
 }
@@ -369 +369 @@
         /* Unregister the area */
         list_remove(&area->link);
-        
+
         /* Free the memory */
         errno_t ret = as_area_destroy(area->addr);
         if (ret != EOK)
                 error_flag = true;
-        
+
         free(area);
         check_consistency("unmap_area");
@@ -405 +405 @@
             pos < end; pos++)
                 *pos = area_expected_value(area, pos);
-        
+
         check_consistency("fill_area");
 }