From 9ec2ac4c8860418beeb107bd58dc6f1284c492d0 Mon Sep 17 00:00:00 2001 From: Alecs King Date: Sat, 31 Dec 2005 15:21:18 +0800 Subject: [PATCH] [PATCH] fix sparse warnings sort.c:192:5: warning: mixing declarations and code sort.c:234:2: warning: mixing declarations and code Signed-off-by: Alecs King Signed-off-by: Linus Torvalds --- sort.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sort.c b/sort.c index c2ac8b7d..749339a5 100644 --- a/sort.c +++ b/sort.c @@ -186,10 +186,10 @@ merge_block_seqs (struct ptr_list *b1, int n, // Element from b2 is smaller buffer[nbuf++] = d2; if (++i2 >= b2->nr) { + struct ptr_list *l = b2; BEEN_THERE('M'); // Ok, we finished with b2. Pull it out // and plug it in before b1. - struct ptr_list *l = b2; b2 = b2->next; b2->prev = l->prev; @@ -224,14 +224,13 @@ merge_block_seqs (struct ptr_list *b1, int n, void sort_list(struct ptr_list **plist, int (*cmp)(const void *, const void *)) { - struct ptr_list *head = *plist; + struct ptr_list *head = *plist, *list = head; int blocks = 1; if (!head) return; // Sort all the sub-lists - struct ptr_list *list = head; do { array_sort(list->list, list->nr, cmp); #ifdef PARANOIA -- 2.11.4.GIT