diff options
| author | Richard Braun <rbraun@sceen.net> | 2018-04-01 18:29:44 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2018-04-01 18:29:44 +0200 |
| commit | 53a83992d4f34aa74579b0580508fc3562456c30 (patch) | |
| tree | 31130b317ba22efd006e9707b5e715fbda5e09af /src | |
| parent | 8be065e69f2bfbac12297fa22f56901e2fbc60ab (diff) | |
Rename variables in function-like macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/avltree.h | 94 | ||||
| -rw-r--r-- | src/hlist.h | 30 | ||||
| -rw-r--r-- | src/list.h | 24 | ||||
| -rw-r--r-- | src/rbtree.h | 94 | ||||
| -rw-r--r-- | src/shell.h | 12 | ||||
| -rw-r--r-- | src/slist.h | 36 |
6 files changed, 145 insertions, 145 deletions
diff --git a/src/avltree.h b/src/avltree.h index 4d78b5b..31c0524 100644 --- a/src/avltree.h +++ b/src/avltree.h @@ -128,22 +128,22 @@ avltree_empty(const struct avltree *tree) */ #define avltree_lookup(tree, key, cmp_fn) \ MACRO_BEGIN \ - struct avltree_node *cur___; \ - int diff___; \ + struct avltree_node *cur_; \ + int diff_; \ \ - cur___ = (tree)->root; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - cur___ = cur___->children[avltree_d2i(diff___)]; \ + cur_ = cur_->children[avltree_d2i(diff_)]; \ } \ \ - cur___; \ + cur_; \ MACRO_END /* @@ -158,30 +158,30 @@ MACRO_END */ #define avltree_lookup_nearest(tree, key, cmp_fn, dir) \ MACRO_BEGIN \ - struct avltree_node *cur___, *prev___; \ - int diff___, index___; \ + struct avltree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = 0; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = 0; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - prev___ = cur___; \ - index___ = avltree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + prev_ = cur_; \ + index_ = avltree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - if (cur___ == NULL) { \ - cur___ = avltree_nearest(prev___, index___, dir); \ + if (cur_ == NULL) { \ + cur_ = avltree_nearest(prev_, index_, dir); \ } \ \ - cur___; \ + cur_; \ MACRO_END /* @@ -200,22 +200,22 @@ MACRO_END */ #define avltree_insert(tree, node, cmp_fn) \ MACRO_BEGIN \ - struct avltree_node *cur___, *prev___; \ - int diff___, index___; \ + struct avltree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = 0; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = 0; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(node, cur___); \ - assert(diff___ != 0); \ - prev___ = cur___; \ - index___ = avltree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(node, cur_); \ + assert(diff_ != 0); \ + prev_ = cur_; \ + index_ = avltree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - avltree_insert_rebalance(tree, prev___, index___, node); \ + avltree_insert_rebalance(tree, prev_, index_, node); \ MACRO_END /* @@ -231,27 +231,27 @@ MACRO_END */ #define avltree_lookup_slot(tree, key, cmp_fn, slot) \ MACRO_BEGIN \ - struct avltree_node *cur___, *prev___; \ - int diff___, index___; \ + struct avltree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = 0; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = 0; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - prev___ = cur___; \ - index___ = avltree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + prev_ = cur_; \ + index_ = avltree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - (slot) = avltree_slot(prev___, index___); \ - cur___; \ + (slot) = avltree_slot(prev_, index_); \ + cur_; \ MACRO_END /* diff --git a/src/hlist.h b/src/hlist.h index 09f281c..c6fbf15 100644 --- a/src/hlist.h +++ b/src/hlist.h @@ -218,23 +218,23 @@ hlist_remove(struct hlist_node *node) */ #define hlist_first_entry(list, type, member) \ MACRO_BEGIN \ - struct hlist_node *first___; \ + struct hlist_node *first_; \ \ - first___ = (list)->first; \ - hlist_end(first___) ? NULL : hlist_entry(first___, type, member); \ + first_ = (list)->first; \ + hlist_end(first_) ? NULL : hlist_entry(first_, type, member); \ MACRO_END /* * Get the entry next to the given entry. */ -#define hlist_next_entry(entry, member) \ +#define hlist_next_entry(entry, member) \ MACRO_BEGIN \ - struct hlist_node *next___; \ + struct hlist_node *next_; \ \ - next___ = (entry)->member.next; \ - hlist_end(next___) \ + next_ = (entry)->member.next; \ + hlist_end(next_) \ ? NULL \ - : hlist_entry(next___, typeof(*entry), member); \ + : hlist_entry(next_, typeof(*entry), member); \ MACRO_END /* @@ -380,10 +380,10 @@ hlist_rcu_remove(struct hlist_node *node) */ #define hlist_rcu_first_entry(list, type, member) \ MACRO_BEGIN \ - struct hlist_node *first___; \ + struct hlist_node *first_; \ \ - first___ = hlist_rcu_first(list); \ - hlist_end(first___) ? NULL : hlist_entry(first___, type, member); \ + first_ = hlist_rcu_first(list); \ + hlist_end(first_) ? NULL : hlist_entry(first_, type, member); \ MACRO_END /* @@ -391,12 +391,12 @@ MACRO_END */ #define hlist_rcu_next_entry(entry, member) \ MACRO_BEGIN \ - struct hlist_node *next___; \ + struct hlist_node *next_; \ \ - next___ = hlist_rcu_next(&entry->member); \ - hlist_end(next___) \ + next_ = hlist_rcu_next(&entry->member); \ + hlist_end(next_) \ ? NULL \ - : hlist_entry(next___, typeof(*entry), member); \ + : hlist_entry(next_, typeof(*entry), member); \ MACRO_END /* @@ -507,14 +507,14 @@ list_rcu_remove(struct list *node) */ #define list_rcu_first_entry(head, type, member) \ MACRO_BEGIN \ - struct list *list___; \ - struct list *first___; \ + struct list *list_; \ + struct list *first_; \ \ - list___ = (head); \ - first___ = list_rcu_first(list___); \ - list_end(list___, first___) \ + list_ = (head); \ + first_ = list_rcu_first(list_); \ + list_end(list_, first_) \ ? NULL \ - : list_entry(first___, type, member); \ + : list_entry(first_, type, member); \ MACRO_END /* @@ -526,14 +526,14 @@ MACRO_END */ #define list_rcu_next_entry(head, entry, member) \ MACRO_BEGIN \ - struct list *list___; \ - struct list *next___; \ + struct list *list_; \ + struct list *next_; \ \ - list___ = (head); \ - next___ = list_rcu_next(&entry->member); \ - list_end(list___, next___) \ + list_ = (head); \ + next_ = list_rcu_next(&entry->member); \ + list_end(list_, next_) \ ? NULL \ - : list_entry(next___, typeof(*entry), member); \ + : list_entry(next_, typeof(*entry), member); \ MACRO_END /* diff --git a/src/rbtree.h b/src/rbtree.h index afc8551..1113224 100644 --- a/src/rbtree.h +++ b/src/rbtree.h @@ -125,22 +125,22 @@ rbtree_empty(const struct rbtree *tree) */ #define rbtree_lookup(tree, key, cmp_fn) \ MACRO_BEGIN \ - struct rbtree_node *cur___; \ - int diff___; \ + struct rbtree_node *cur_; \ + int diff_; \ \ - cur___ = (tree)->root; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - cur___ = cur___->children[rbtree_d2i(diff___)]; \ + cur_ = cur_->children[rbtree_d2i(diff_)]; \ } \ \ - cur___; \ + cur_; \ MACRO_END /* @@ -155,30 +155,30 @@ MACRO_END */ #define rbtree_lookup_nearest(tree, key, cmp_fn, dir) \ MACRO_BEGIN \ - struct rbtree_node *cur___, *prev___; \ - int diff___, index___; \ + struct rbtree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = -1; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = -1; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - prev___ = cur___; \ - index___ = rbtree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + prev_ = cur_; \ + index_ = rbtree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - if (cur___ == NULL) { \ - cur___ = rbtree_nearest(prev___, index___, dir); \ + if (cur_ == NULL) { \ + cur_ = rbtree_nearest(prev_, index_, dir); \ } \ \ - cur___; \ + cur_; \ MACRO_END /* @@ -199,22 +199,22 @@ MACRO_END */ #define rbtree_insert(tree, node, cmp_fn) \ MACRO_BEGIN \ - struct rbtree_node *cur___, *prev___; \ - int diff___, index___; \ + struct rbtree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = -1; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = -1; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(node, cur___); \ - assert(diff___ != 0); \ - prev___ = cur___; \ - index___ = rbtree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(node, cur_); \ + assert(diff_ != 0); \ + prev_ = cur_; \ + index_ = rbtree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - rbtree_insert_rebalance(tree, prev___, index___, node); \ + rbtree_insert_rebalance(tree, prev_, index_, node); \ MACRO_END /* @@ -230,27 +230,27 @@ MACRO_END */ #define rbtree_lookup_slot(tree, key, cmp_fn, slot) \ MACRO_BEGIN \ - struct rbtree_node *cur___, *prev___; \ - int diff___, index___; \ + struct rbtree_node *cur_, *prev_; \ + int diff_, index_; \ \ - prev___ = NULL; \ - index___ = 0; \ - cur___ = (tree)->root; \ + prev_ = NULL; \ + index_ = 0; \ + cur_ = (tree)->root; \ \ - while (cur___ != NULL) { \ - diff___ = cmp_fn(key, cur___); \ + while (cur_ != NULL) { \ + diff_ = cmp_fn(key, cur_); \ \ - if (diff___ == 0) { \ + if (diff_ == 0) { \ break; \ } \ \ - prev___ = cur___; \ - index___ = rbtree_d2i(diff___); \ - cur___ = cur___->children[index___]; \ + prev_ = cur_; \ + index_ = rbtree_d2i(diff_); \ + cur_ = cur_->children[index_]; \ } \ \ - (slot) = rbtree_slot(prev___, index___); \ - cur___; \ + (slot) = rbtree_slot(prev_, index_); \ + cur_; \ MACRO_END /* diff --git a/src/shell.h b/src/shell.h index 57439b1..52e2385 100644 --- a/src/shell.h +++ b/src/shell.h @@ -38,14 +38,14 @@ #define SHELL_REGISTER_CMDS(cmds) \ MACRO_BEGIN \ - size_t i___; \ - int error___; \ + size_t i_; \ + int error_; \ \ - for (i___ = 0; i___ < ARRAY_SIZE(cmds); i___++) { \ - error___ = shell_cmd_register(&(cmds)[i___]); \ + for (i_ = 0; i_ < ARRAY_SIZE(cmds); i_++) { \ + error_ = shell_cmd_register(&(cmds)[i_]); \ \ - if (error___) { \ - fprintf(stderr, "%s: %s\n", __func__, strerror(error___)); \ + if (error_) { \ + fprintf(stderr, "%s: %s\n", __func__, strerror(error_)); \ abort(); \ } \ } \ diff --git a/src/slist.h b/src/slist.h index 332f0c5..60e6540 100644 --- a/src/slist.h +++ b/src/slist.h @@ -240,10 +240,10 @@ slist_remove(struct slist *list, struct slist_node *prev) */ #define slist_first_entry(list, type, member) \ MACRO_BEGIN \ - struct slist_node *first___; \ + struct slist_node *first_; \ \ - first___ = (list)->first; \ - slist_end(first___) ? NULL : slist_entry(first___, type, member); \ + first_ = (list)->first; \ + slist_end(first_) ? NULL : slist_entry(first_, type, member); \ MACRO_END /* @@ -251,23 +251,23 @@ MACRO_END */ #define slist_last_entry(list, type, member) \ MACRO_BEGIN \ - struct slist_node *last___; \ + struct slist_node *last_; \ \ - last___ = (list)->last; \ - slist_end(last___) ? NULL : slist_entry(last___, type, member); \ + last_ = (list)->last; \ + slist_end(last_) ? NULL : slist_entry(last_, type, member); \ MACRO_END /* * Get the entry next to the given entry. */ -#define slist_next_entry(entry, member) \ +#define slist_next_entry(entry, member) \ MACRO_BEGIN \ - struct slist_node *next___; \ + struct slist_node *next_; \ \ - next___ = (entry)->member.next; \ - slist_end(next___) \ + next_ = (entry)->member.next; \ + slist_end(next_) \ ? NULL \ - : slist_entry(next___, typeof(*entry), member); \ + : slist_entry(next_, typeof(*entry), member); \ MACRO_END /* @@ -430,10 +430,10 @@ slist_rcu_remove(struct slist *list, struct slist_node *prev) */ #define slist_rcu_first_entry(list, type, member) \ MACRO_BEGIN \ - struct slist_node *first___; \ + struct slist_node *first_; \ \ - first___ = slist_rcu_first(list); \ - slist_end(first___) ? NULL : slist_entry(first___, type, member); \ + first_ = slist_rcu_first(list); \ + slist_end(first_) ? NULL : slist_entry(first_, type, member); \ MACRO_END /* @@ -441,12 +441,12 @@ MACRO_END */ #define slist_rcu_next_entry(entry, member) \ MACRO_BEGIN \ - struct slist_node *next___; \ + struct slist_node *next_; \ \ - next___ = slist_rcu_next(&entry->member); \ - slist_end(next___) \ + next_ = slist_rcu_next(&entry->member); \ + slist_end(next_) \ ? NULL \ - : slist_entry(next___, typeof(*entry), member); \ + : slist_entry(next_, typeof(*entry), member); \ MACRO_END /* |