Changeset 98000fb in mainline for kernel/generic/src/adt


Ignore:
Timestamp:
2009-06-03T19:34:45Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
301ff30
Parents:
69e68e3
Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:
kernel/generic/src/adt
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/adt/bitmap.c

    r69e68e3 r98000fb  
    5555 * @param bits Number of bits stored in bitmap.
    5656 */
    57 void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits)
     57void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits)
    5858{
    5959        bitmap->map = map;
     
    6767 * @param bits Number of bits to set.
    6868 */
    69 void bitmap_set_range(bitmap_t *bitmap, index_t start, count_t bits)
     69void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits)
    7070{
    71         index_t i=0;
    72         index_t aligned_start;
    73         count_t lub;            /* leading unaligned bits */
    74         count_t amb;            /* aligned middle bits */
    75         count_t tab;            /* trailing aligned bits */
     71        size_t i = 0;
     72        size_t aligned_start;
     73        size_t lub;             /* leading unaligned bits */
     74        size_t amb;             /* aligned middle bits */
     75        size_t tab;             /* trailing aligned bits */
    7676       
    7777        ASSERT(start + bits <= bitmap->bits);
     
    117117 * @param bits Number of bits to clear.
    118118 */
    119 void bitmap_clear_range(bitmap_t *bitmap, index_t start, count_t bits)
     119void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits)
    120120{
    121         index_t i=0;
    122         index_t aligned_start;
    123         count_t lub;            /* leading unaligned bits */
    124         count_t amb;            /* aligned middle bits */
    125         count_t tab;            /* trailing aligned bits */
     121        size_t i = 0;
     122        size_t aligned_start;
     123        size_t lub;             /* leading unaligned bits */
     124        size_t amb;             /* aligned middle bits */
     125        size_t tab;             /* trailing aligned bits */
    126126       
    127127        ASSERT(start + bits <= bitmap->bits);
     
    169169 * @param bits Number of bits to copy.
    170170 */
    171 void bitmap_copy(bitmap_t *dst, bitmap_t *src, count_t bits)
     171void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits)
    172172{
    173         index_t i;
     173        size_t i;
    174174       
    175175        ASSERT(bits <= dst->bits);
  • kernel/generic/src/adt/btree.c

    r69e68e3 r98000fb  
    6464static btree_node_t *node_split(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree, btree_key_t *median);
    6565static btree_node_t *node_combine(btree_node_t *node);
    66 static index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
    67 static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
    68 static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
     66static size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
     67static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
     68static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
    6969static bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
    7070static bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
     
    138138void btree_destroy_subtree(btree_node_t *root)
    139139{
    140         count_t i;
     140        size_t i;
    141141
    142142        if (root->keys) {
     
    270270       
    271271        if (node->keys > FILL_FACTOR) {
    272                 count_t i;
     272                size_t i;
    273273
    274274                /*
     
    286286               
    287287        } else {
    288                 index_t idx;
     288                size_t idx;
    289289                btree_node_t *rnode, *parent;
    290290
     
    336336                } else {
    337337                        void *val;
    338                         count_t i;
     338                        size_t i;
    339339               
    340340                        /*
     
    443443void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *lsubtree)
    444444{
    445         count_t i;
     445        size_t i;
    446446
    447447        for (i = 0; i < node->keys; i++) {
    448448                if (key < node->key[i]) {
    449                         count_t j;
     449                        size_t j;
    450450               
    451451                        for (j = node->keys; j > i; j--) {
     
    479479void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree)
    480480{
    481         count_t i;
     481        size_t i;
    482482
    483483        for (i = 0; i < node->keys; i++) {
    484484                if (key < node->key[i]) {
    485                         count_t j;
     485                        size_t j;
    486486               
    487487                        for (j = node->keys; j > i; j--) {
     
    511511void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
    512512{
    513         count_t i, j;
     513        size_t i, j;
    514514       
    515515        for (i = 0; i < node->keys; i++) {
     
    539539void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
    540540{
    541         count_t i, j;
     541        size_t i, j;
    542542       
    543543        for (i = 0; i < node->keys; i++) {
     
    577577{
    578578        btree_node_t *rnode;
    579         count_t i, j;
     579        size_t i, j;
    580580
    581581        ASSERT(median);
     
    604604         * If this is an index node, do not copy the median.
    605605         */
    606         i = (count_t) INDEX_NODE(node);
     606        i = (size_t) INDEX_NODE(node);
    607607        for (i += MEDIAN_HIGH_INDEX(node), j = 0; i < node->keys; i++, j++) {
    608608                rnode->key[j] = node->key[i];
     
    637637btree_node_t *node_combine(btree_node_t *node)
    638638{
    639         index_t idx;
     639        size_t idx;
    640640        btree_node_t *rnode;
    641         count_t i;
     641        size_t i;
    642642
    643643        ASSERT(!ROOT_NODE(node));
     
    686686 * @return Index of the key associated with the subtree.
    687687 */
    688 index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
    689 {
    690         count_t i;
     688size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
     689{
     690        size_t i;
    691691       
    692692        for (i = 0; i < node->keys + 1; i++) {
     
    707707 * @param idx Index of the parent node key that is taking part in the rotation.
    708708 */
    709 void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
     709void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
    710710{
    711711        btree_key_t key;
     
    744744 * @param idx Index of the parent node key that is taking part in the rotation.
    745745 */
    746 void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
     746void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
    747747{
    748748        btree_key_t key;
     
    787787bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
    788788{
    789         index_t idx;
     789        size_t idx;
    790790        btree_node_t *lnode;
    791791
     
    834834bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
    835835{
    836         index_t idx;
     836        size_t idx;
    837837        btree_node_t *rnode;
    838838
     
    873873bool try_rotation_from_left(btree_node_t *rnode)
    874874{
    875         index_t idx;
     875        size_t idx;
    876876        btree_node_t *lnode;
    877877
     
    908908bool try_rotation_from_right(btree_node_t *lnode)
    909909{
    910         index_t idx;
     910        size_t idx;
    911911        btree_node_t *rnode;
    912912
     
    941941void btree_print(btree_t *t)
    942942{
    943         count_t i;
     943        size_t i;
    944944        int depth = t->root->depth;
    945945        link_t head, *cur;
  • kernel/generic/src/adt/hash_table.c

    r69e68e3 r98000fb  
    5252 * @param op Hash table operations structure.
    5353 */
    54 void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op)
     54void hash_table_create(hash_table_t *h, size_t m, size_t max_keys, hash_table_operations_t *op)
    5555{
    56         index_t i;
     56        size_t i;
    5757
    5858        ASSERT(h);
     
    8484void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
    8585{
    86         index_t chain;
     86        size_t chain;
    8787       
    8888        ASSERT(item);
     
    108108{
    109109        link_t *cur;
    110         index_t chain;
     110        size_t chain;
    111111       
    112112        ASSERT(h);
     
    138138 * @param keys Number of keys in the key array.
    139139 */
    140 void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys)
     140void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys)
    141141{
    142         index_t chain;
     142        size_t chain;
    143143        link_t *cur;
    144144       
Note: See TracChangeset for help on using the changeset viewer.