summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-09 18:02:36 -0700
committerunknown <jimw@mysql.com>2005-08-09 18:02:36 -0700
commitbea4fbb052d47a1f98d15e5ed7127f39a2e2db54 (patch)
treecf238206fdfb8b8d2fc9727fef3cde6565dc21ea /mysys
parent888a931432cfe4f35744226563aafd5a1545650d (diff)
downloadmariadb-git-bea4fbb052d47a1f98d15e5ed7127f39a2e2db54.tar.gz
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().
Diffstat (limited to 'mysys')
-rw-r--r--mysys/list.c2
-rw-r--r--mysys/thr_lock.c3
2 files changed, 3 insertions, 2 deletions
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));