diff options
Diffstat (limited to 'storage/innobase/ut/ut0list.cc')
| -rw-r--r-- | storage/innobase/ut/ut0list.cc | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/storage/innobase/ut/ut0list.cc b/storage/innobase/ut/ut0list.cc index f906061d185..f62cbf8232b 100644 --- a/storage/innobase/ut/ut0list.cc +++ b/storage/innobase/ut/ut0list.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2006, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -30,15 +30,14 @@ Created 4/26/2006 Osku Salerma /****************************************************************//** Create a new list. -@return list */ -UNIV_INTERN +@return list */ ib_list_t* ib_list_create(void) /*=================*/ { ib_list_t* list; - list = static_cast<ib_list_t*>(mem_alloc(sizeof(*list))); + list = static_cast<ib_list_t*>(ut_malloc_nokey(sizeof(*list))); list->first = NULL; list->last = NULL; @@ -50,8 +49,7 @@ ib_list_create(void) /****************************************************************//** Create a new list using the given heap. ib_list_free MUST NOT BE CALLED for lists created with this function. -@return list */ -UNIV_INTERN +@return list */ ib_list_t* ib_list_create_heap( /*================*/ @@ -70,7 +68,6 @@ ib_list_create_heap( /****************************************************************//** Free a list. */ -UNIV_INTERN void ib_list_free( /*=========*/ @@ -82,13 +79,12 @@ ib_list_free( to e.g. have all the nodes allocated from a single heap that is then freed after the list itself is freed. */ - mem_free(list); + ut_free(list); } /****************************************************************//** Add the data to the start of the list. -@return new list node */ -UNIV_INTERN +@return new list node */ ib_list_node_t* ib_list_add_first( /*==============*/ @@ -101,8 +97,7 @@ ib_list_add_first( /****************************************************************//** Add the data to the end of the list. -@return new list node */ -UNIV_INTERN +@return new list node */ ib_list_node_t* ib_list_add_last( /*=============*/ @@ -115,8 +110,7 @@ ib_list_add_last( /****************************************************************//** Add the data after the indicated node. -@return new list node */ -UNIV_INTERN +@return new list node */ ib_list_node_t* ib_list_add_after( /*==============*/ @@ -172,7 +166,6 @@ ib_list_add_after( /****************************************************************//** Remove the node from the list. */ -UNIV_INTERN void ib_list_remove( /*===========*/ |