treap: style fix
Missing spaces in while (0) and trpn_pointer(a, b). Remove parentheses around return value. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 12, 2010 at 17:02 UTC
6ad263ce7afc6c21c3ada1691f4772993b8ae46b
1 file changed
+15
-15
vcs-svn/trp.h
+15
-15
@@ -37,7 +37,7 @@ struct trp_root {
37
*trpn_pointer(a_base, a_offset) = \
38
*trpn_pointer(a_base, old_offset); \
39
} \
40
- } while (0);
40
+ } while (0)
41
42
/* Left accessors. */
43
#define trp_left_get(a_base, a_field, a_node) \
@@ -46,7 +46,7 @@ struct trp_root {
46
do { \
47
trpn_modify(a_base, a_node); \
48
trp_left_get(a_base, a_field, a_node) = (a_left); \
49
- } while(0)
49
+ } while (0)
50
51
/* Right accessors. */
52
#define trp_right_get(a_base, a_field, a_node) \
@@ -55,7 +55,7 @@ struct trp_root {
55
do { \
56
trpn_modify(a_base, a_node); \
57
trp_right_get(a_base, a_field, a_node) = (a_right); \
58
- } while(0)
58
+ } while (0)
59
60
/*
61
* Fibonacci hash function.
@@ -72,7 +72,7 @@ struct trp_root {
72
do { \
73
trp_left_set(a_base, a_field, (a_node), ~0); \
74
trp_right_set(a_base, a_field, (a_node), ~0); \
75
- } while(0)
75
+ } while (0)
76
77
/* Internal utility macros. */
78
#define trpn_first(a_base, a_field, a_root, r_node) \
@@ -90,7 +90,7 @@ struct trp_root {
90
trp_right_set(a_base, a_field, (a_node), \
91
trp_left_get(a_base, a_field, (r_node))); \
92
trp_left_set(a_base, a_field, (r_node), (a_node)); \
93
- } while(0)
93
+ } while (0)
94
95
#define trpn_rotate_right(a_base, a_field, a_node, r_node) \
96
do { \
@@ -98,7 +98,7 @@ struct trp_root {
98
trp_left_set(a_base, a_field, (a_node), \
99
trp_right_get(a_base, a_field, (r_node))); \
100
trp_right_set(a_base, a_field, (r_node), (a_node)); \
101
- } while(0)
101
+ } while (0)
102
103
#define trp_gen(a_attr, a_pre, a_type, a_field, a_base, a_cmp) \
104
a_attr a_type MAYBE_UNUSED *a_pre##first(struct trp_root *treap) \
@@ -136,7 +136,7 @@ a_attr a_type MAYBE_UNUSED *a_pre##search(struct trp_root *treap, a_type *key) \
136
{ \
137
int cmp; \
138
uint32_t ret = treap->trp_root; \
139
- while (~ret && (cmp = (a_cmp)(key, trpn_pointer(a_base,ret)))) { \
139
+ while (~ret && (cmp = (a_cmp)(key, trpn_pointer(a_base, ret)))) { \
140
if (cmp < 0) { \
141
ret = trp_left_get(a_base, a_field, ret); \
142
} else { \
@@ -149,7 +149,7 @@ a_attr a_type MAYBE_UNUSED *a_pre##nsearch(struct trp_root *treap, a_type *key)
149
{ \
150
int cmp; \
151
uint32_t ret = treap->trp_root; \
152
- while (~ret && (cmp = (a_cmp)(key, trpn_pointer(a_base,ret)))) { \
152
+ while (~ret && (cmp = (a_cmp)(key, trpn_pointer(a_base, ret)))) { \
153
if (cmp < 0) { \
154
if (!~trp_left_get(a_base, a_field, ret)) \
155
break; \
@@ -163,7 +163,7 @@ a_attr a_type MAYBE_UNUSED *a_pre##nsearch(struct trp_root *treap, a_type *key)
163
a_attr uint32_t MAYBE_UNUSED a_pre##insert_recurse(uint32_t cur_node, uint32_t ins_node) \
164
{ \
165
if (cur_node == ~0) { \
166
- return (ins_node); \
166
+ return ins_node; \
167
} else { \
168
uint32_t ret; \
169
int cmp = (a_cmp)(trpn_pointer(a_base, ins_node), \
@@ -185,7 +185,7 @@ a_attr uint32_t MAYBE_UNUSED a_pre##insert_recurse(uint32_t cur_node, uint32_t i
185
else \
186
ret = cur_node; \
187
} \
188
- return (ret); \
188
+ return ret; \
189
} \
190
} \
191
a_attr void MAYBE_UNUSED a_pre##insert(struct trp_root *treap, a_type *node) \
@@ -204,27 +204,27 @@ a_attr uint32_t MAYBE_UNUSED a_pre##remove_recurse(uint32_t cur_node, uint32_t r
204
uint32_t right = trp_right_get(a_base, a_field, cur_node); \
205
if (left == ~0) { \
206
if (right == ~0) \
207
- return (~0); \
207
+ return ~0; \
208
} else if (right == ~0 || trp_prio_get(left) < trp_prio_get(right)) { \
209
trpn_rotate_right(a_base, a_field, cur_node, ret); \
210
right = a_pre##remove_recurse(cur_node, rem_node); \
211
trp_right_set(a_base, a_field, ret, right); \
212
- return (ret); \
212
+ return ret; \
213
} \
214
trpn_rotate_left(a_base, a_field, cur_node, ret); \
215
left = a_pre##remove_recurse(cur_node, rem_node); \
216
trp_left_set(a_base, a_field, ret, left); \
217
- return (ret); \
217
+ return ret; \
218
} else if (cmp < 0) { \
219
uint32_t left = a_pre##remove_recurse( \
220
trp_left_get(a_base, a_field, cur_node), rem_node); \
221
trp_left_set(a_base, a_field, cur_node, left); \
222
- return (cur_node); \
222
+ return cur_node; \
223
} else { \
224
uint32_t right = a_pre##remove_recurse( \
225
trp_right_get(a_base, a_field, cur_node), rem_node); \
226
trp_right_set(a_base, a_field, cur_node, right); \
227
- return (cur_node); \
227
+ return cur_node; \
228
} \
229
} \
230
a_attr void MAYBE_UNUSED a_pre##remove(struct trp_root *treap, a_type *node) \