Changeset a35b458 in mainline for kernel/generic/include/adt


Ignore:
Timestamp:
2018-03-02T20:10:49Z (8 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.

Location:
kernel/generic/include/adt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/adt/avl.h

    r3061bc1 ra35b458  
    6969         */
    7070        struct avltree_node *lft;
    71        
     71
    7272        /**
    7373         * Pointer to the right descendant of this node.
    … …  
    7777         */
    7878        struct avltree_node *rgt;
    79        
     79
    8080        /** Pointer to the parent node. Root node has NULL parent. */
    8181        struct avltree_node *par;
    82        
     82
    8383        /** Node's key. */
    8484        avltree_key_t key;
    85        
     85
    8686        /**
    8787         * Difference between the heights of the left and the right subtree of

  • kernel/generic/include/adt/bitmap.h

    r3061bc1 ra35b458  
    5454        if (element >= bitmap->elements)
    5555                return;
    56        
     56
    5757        size_t byte = element / BITMAP_ELEMENT;
    5858        uint8_t mask = 1 << (element & BITMAP_REMAINER);
    59        
     59
    6060        if (value) {
    6161                bitmap->bits[byte] |= mask;
    … …  
    7070        if (element >= bitmap->elements)
    7171                return 0;
    72        
     72
    7373        size_t byte = element / BITMAP_ELEMENT;
    7474        uint8_t mask = 1 << (element & BITMAP_REMAINER);
    75        
     75
    7676        return !!((bitmap->bits)[byte] & mask);
    7777}

  • kernel/generic/include/adt/btree.h

    r3061bc1 ra35b458  
    6060         */
    6161        void *value[BTREE_MAX_KEYS + 1];
    62        
     62
    6363        /**
    6464         * Pointers to descendants of this node sorted according to the key

  • kernel/generic/include/adt/cht.h

    r3061bc1 ra35b458  
    9595        /** Item specific operations. */
    9696        cht_ops_t *op;
    97        
     97
    9898        /** Buckets currently in use. */
    9999        cht_buckets_t *b;
    … …  
    120120         */
    121121        atomic_t resize_reqs;
    122        
     122
    123123        /** Number of items in the table that have not been logically deleted. */
    124124        atomic_t item_cnt;

  • kernel/generic/include/adt/hash_table.h

    r3061bc1 ra35b458  
    5151        /** Returns the hash of the key stored in the item (ie its lookup key). */
    5252        size_t (*hash)(const ht_link_t *item);
    53        
     53
    5454        /** Returns the hash of the key. */
    5555        size_t (*key_hash)(void *key);
    56        
     56
    5757        /** True if the items are equal (have the same lookup keys). */
    5858        bool (*equal)(const ht_link_t *item1, const ht_link_t *item2);

  • kernel/generic/include/adt/list.h

    r3061bc1 ra35b458  
    231231                link->prev->next = link->next;
    232232        }
    233        
     233
    234234        link_initialize(link);
    235235}
    … …  
    314314        part1->prev->next = part2;
    315315        part2->prev->next = part1;
    316        
     316
    317317        link_t *hlp = part1->prev;
    318        
     318
    319319        part1->prev = part2->prev;
    320320        part2->prev = hlp;
    … …  
    378378{
    379379        unsigned long cnt = 0;
    380        
     380
    381381        link_t *link = list_first(list);
    382382        while (link != NULL) {
    383383                if (cnt == n)
    384384                        return link;
    385                
     385
    386386                cnt++;
    387387                link = list_next(link, list);
    388388        }
    389        
     389
    390390        return NULL;
    391391}
Note: See TracChangeset for help on using the changeset viewer.