LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Do not use the non-standard typeof operator

Browse source
This commit is contained in:
pooler 2014-05-16 11:06:02 +02:00
parent f76c4d6273
commit ab6d34e043
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
elist.h
View file

@ -215,11 +215,12 @@ static inline void list_splice_init(struct list_head *list,
* @pos: the type * to use as a loop counter. * @pos: the type * to use as a loop counter.
* @head: the head for your list. * @head: the head for your list.
* @member: the name of the list_struct within the struct. * @member: the name of the list_struct within the struct.
* @type: the type of the struct.
*/ */
#define list_for_each_entry(pos, head, member) \ #define list_for_each_entry(pos, head, member, type) \
for (pos = list_entry((head)->next, typeof(*pos), member); \ for (pos = list_entry((head)->next, type, member); \
&pos->member != (head); \ &pos->member != (head); \
pos = list_entry(pos->member.next, typeof(*pos), member)) pos = list_entry(pos->member.next, type, member))
/** /**
* list_for_each_entry_safe - iterate over list of given type safe against removal of list entry * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
@ -227,12 +228,13 @@ static inline void list_splice_init(struct list_head *list,
* @n: another type * to use as temporary storage * @n: another type * to use as temporary storage
* @head: the head for your list. * @head: the head for your list.
* @member: the name of the list_struct within the struct. * @member: the name of the list_struct within the struct.
* @type: the type of the struct.
*/ */
#define list_for_each_entry_safe(pos, n, head, member) \ #define list_for_each_entry_safe(pos, n, head, member, type) \
for (pos = list_entry((head)->next, typeof(*pos), member), \ for (pos = list_entry((head)->next, type, member), \
n = list_entry(pos->member.next, typeof(*pos), member); \ n = list_entry(pos->member.next, type, member); \
&pos->member != (head); \ &pos->member != (head); \
pos = n, n = list_entry(n->member.next, typeof(*n), member)) pos = n, n = list_entry(n->member.next, type, member))
/** /**
* list_for_each_entry_continue - iterate over list of given type * list_for_each_entry_continue - iterate over list of given type
@ -240,12 +242,13 @@ static inline void list_splice_init(struct list_head *list,
* @pos: the type * to use as a loop counter. * @pos: the type * to use as a loop counter.
* @head: the head for your list. * @head: the head for your list.
* @member: the name of the list_struct within the struct. * @member: the name of the list_struct within the struct.
* @type: the type of the struct.
*/ */
#define list_for_each_entry_continue(pos, head, member) \ #define list_for_each_entry_continue(pos, head, member, type) \
for (pos = list_entry(pos->member.next, typeof(*pos), member), \ for (pos = list_entry(pos->member.next, type, member), \
prefetch(pos->member.next); \ prefetch(pos->member.next); \
&pos->member != (head); \ &pos->member != (head); \
pos = list_entry(pos->member.next, typeof(*pos), member), \ pos = list_entry(pos->member.next, type, member), \
prefetch(pos->member.next)) prefetch(pos->member.next))
#endif #endif

2
util.c
View file

@ -1417,7 +1417,7 @@ void tq_free(struct thread_q *tq)
if (!tq) if (!tq)
return; return;
list_for_each_entry_safe(ent, iter, &tq->q, q_node) { list_for_each_entry_safe(ent, iter, &tq->q, q_node, struct tq_ent) {
list_del(&ent->q_node); list_del(&ent->q_node);
free(ent); free(ent);
} }