Skip to content

Commit 6ad263c

Browse files
jrngitster
jrn
authored and
gitster
committed
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>
1 parent be47d5a commit 6ad263c

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎vcs-svn/trp.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct trp_root {
3737
*trpn_pointer(a_base, a_offset) = \
3838
*trpn_pointer(a_base, old_offset); \
3939
} \
40-
} while (0);
40+
} while (0)
4141

4242
/* Left accessors. */
4343
#define trp_left_get(a_base, a_field, a_node) \
@@ -46,7 +46,7 @@ struct trp_root {
4646
do { \
4747
trpn_modify(a_base, a_node); \
4848
trp_left_get(a_base, a_field, a_node) = (a_left); \
49-
} while(0)
49+
} while (0)
5050

5151
/* Right accessors. */
5252
#define trp_right_get(a_base, a_field, a_node) \
@@ -55,7 +55,7 @@ struct trp_root {
5555
do { \
5656
trpn_modify(a_base, a_node); \
5757
trp_right_get(a_base, a_field, a_node) = (a_right); \
58-
} while(0)
58+
} while (0)
5959

6060
/*
6161
* Fibonacci hash function.
@@ -72,7 +72,7 @@ struct trp_root {
7272
do { \
7373
trp_left_set(a_base, a_field, (a_node), ~0); \
7474
trp_right_set(a_base, a_field, (a_node), ~0); \
75-
} while(0)
75+
} while (0)
7676

7777
/* Internal utility macros. */
7878
#define trpn_first(a_base, a_field, a_root, r_node) \
@@ -90,15 +90,15 @@ struct trp_root {
9090
trp_right_set(a_base, a_field, (a_node), \
9191
trp_left_get(a_base, a_field, (r_node))); \
9292
trp_left_set(a_base, a_field, (r_node), (a_node)); \
93-
} while(0)
93+
} while (0)
9494

9595
#define trpn_rotate_right(a_base, a_field, a_node, r_node) \
9696
do { \
9797
(r_node) = trp_left_get(a_base, a_field, (a_node)); \
9898
trp_left_set(a_base, a_field, (a_node), \
9999
trp_right_get(a_base, a_field, (r_node))); \
100100
trp_right_set(a_base, a_field, (r_node), (a_node)); \
101-
} while(0)
101+
} while (0)
102102

103103
#define trp_gen(a_attr, a_pre, a_type, a_field, a_base, a_cmp) \
104104
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) \
136136
{ \
137137
int cmp; \
138138
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)))) { \
140140
if (cmp < 0) { \
141141
ret = trp_left_get(a_base, a_field, ret); \
142142
} else { \
@@ -149,7 +149,7 @@ a_attr a_type MAYBE_UNUSED *a_pre##nsearch(struct trp_root *treap, a_type *key)
149149
{ \
150150
int cmp; \
151151
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)))) { \
153153
if (cmp < 0) { \
154154
if (!~trp_left_get(a_base, a_field, ret)) \
155155
break; \
@@ -163,7 +163,7 @@ a_attr a_type MAYBE_UNUSED *a_pre##nsearch(struct trp_root *treap, a_type *key)
163163
a_attr uint32_t MAYBE_UNUSED a_pre##insert_recurse(uint32_t cur_node, uint32_t ins_node) \
164164
{ \
165165
if (cur_node == ~0) { \
166-
return (ins_node); \
166+
return ins_node; \
167167
} else { \
168168
uint32_t ret; \
169169
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
185185
else \
186186
ret = cur_node; \
187187
} \
188-
return (ret); \
188+
return ret; \
189189
} \
190190
} \
191191
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
204204
uint32_t right = trp_right_get(a_base, a_field, cur_node); \
205205
if (left == ~0) { \
206206
if (right == ~0) \
207-
return (~0); \
207+
return ~0; \
208208
} else if (right == ~0 || trp_prio_get(left) < trp_prio_get(right)) { \
209209
trpn_rotate_right(a_base, a_field, cur_node, ret); \
210210
right = a_pre##remove_recurse(cur_node, rem_node); \
211211
trp_right_set(a_base, a_field, ret, right); \
212-
return (ret); \
212+
return ret; \
213213
} \
214214
trpn_rotate_left(a_base, a_field, cur_node, ret); \
215215
left = a_pre##remove_recurse(cur_node, rem_node); \
216216
trp_left_set(a_base, a_field, ret, left); \
217-
return (ret); \
217+
return ret; \
218218
} else if (cmp < 0) { \
219219
uint32_t left = a_pre##remove_recurse( \
220220
trp_left_get(a_base, a_field, cur_node), rem_node); \
221221
trp_left_set(a_base, a_field, cur_node, left); \
222-
return (cur_node); \
222+
return cur_node; \
223223
} else { \
224224
uint32_t right = a_pre##remove_recurse( \
225225
trp_right_get(a_base, a_field, cur_node), rem_node); \
226226
trp_right_set(a_base, a_field, cur_node, right); \
227-
return (cur_node); \
227+
return cur_node; \
228228
} \
229229
} \
230230
a_attr void MAYBE_UNUSED a_pre##remove(struct trp_root *treap, a_type *node) \

0 commit comments

Comments
 (0)