diff mbox

[2/5] ptrlist: keep declaration of head-list-nr together

Message ID 20180618204233.68858-3-luc.vanoostenryck@gmail.com (mailing list archive)
State Mainlined, archived
Headers show

Commit Message

Luc Van Oostenryck June 18, 2018, 8:42 p.m. UTC 
The list walking macros need to keep some state:
- the head of the list:              head
- the current list 'block':          list
- the current position in the block: nr

Make this clear by keeping their declaration together.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 ptrlist.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/ptrlist.h b/ptrlist.h
index 37d866de2..20a156427 100644
--- a/ptrlist.h
+++ b/ptrlist.h
@@ -124,9 +124,10 @@  extern void __free_ptr_list(struct ptr_list **);
 #define DO_FOR_EACH(head, ptr, __head, __list, __nr, PTR_ENTRY) do {	\
 	__typeof__(head) __head = (head);				\
 	__typeof__(head) __list = __head;				\
+	int __nr;							\
 	if (!__head)							\
 		break;							\
-	do { int __nr;							\
+	do {								\
 		for (__nr = 0; __nr < __list->nr; __nr++) {		\
 			ptr = PTR_ENTRY(__list,__nr);			\
 			if (__list->rm && !ptr)				\
@@ -140,9 +141,10 @@  extern void __free_ptr_list(struct ptr_list **);
 #define DO_FOR_EACH_REVERSE(head, ptr, __head, __list, __nr, PTR_ENTRY) do { \
 	__typeof__(head) __head = (head);				\
 	__typeof__(head) __list = __head;				\
+	int __nr;							\
 	if (!head)							\
 		break;							\
-	do { int __nr;							\
+	do {								\
 		__list = __list->prev;					\
 		__nr = __list->nr;					\
 		while (--__nr >= 0) {					\