From bea4fbb052d47a1f98d15e5ed7127f39a2e2db54 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 9 Aug 2005 18:02:36 -0700
Subject: [PATCH] Rename rest() macro in my_list.h to list_rest(). (Bug #12327)

include/my_list.h:
  Rename rest() macro to list_rest().
mysys/list.c:
  rest() renamed to list_rest().
mysys/thr_lock.c:
  rest() renamed to list_rest().
sql/sql_test.cc:
  rest() renamed to list_rest().
---
 include/my_list.h | 2 +-
 mysys/list.c      | 2 +-
 mysys/thr_lock.c  | 3 ++-
 sql/sql_test.cc   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/my_list.h b/include/my_list.h
index f786621e311..92598696fc4 100644
--- a/include/my_list.h
+++ b/include/my_list.h
@@ -36,7 +36,7 @@ extern void list_free(LIST *root,unsigned int free_data);
 extern unsigned int list_length(LIST *);
 extern int list_walk(LIST *,list_walk_action action,gptr argument);
 
-#define rest(a) ((a)->next)
+#define list_rest(a) ((a)->next)
 #define list_push(a,b) (a)=list_cons((b),(a))
 #define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); }
 
diff --git a/mysys/list.c b/mysys/list.c
index 64fca10dc0b..480c1080a45 100644
--- a/mysys/list.c
+++ b/mysys/list.c
@@ -109,7 +109,7 @@ int list_walk(LIST *list, list_walk_action action, gptr argument)
   {
     if ((error = (*action)(list->data,argument)))
       return error;
-    list=rest(list);
+    list=list_rest(list);
   }
   return 0;
 }
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index dc4959f23c1..d6443539216 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -1127,7 +1127,8 @@ void thr_print_locks(void)
 
   pthread_mutex_lock(&THR_LOCK_lock);
   puts("Current locks:");
-  for (list=thr_lock_thread_list ; list && count++ < MAX_THREADS ; list=rest(list))
+  for (list= thr_lock_thread_list; list && count++ < MAX_THREADS;
+       list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
     VOID(pthread_mutex_lock(&lock->mutex));
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index d992c93f8fc..8af7903a910 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -271,7 +271,7 @@ static void display_table_locks(void)
 
   VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50));
   VOID(pthread_mutex_lock(&THR_LOCK_lock));
-  for (list=thr_lock_thread_list ; list ; list=rest(list))
+  for (list= thr_lock_thread_list; list; list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;