database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

BUG#12983

Browse Source 
TRASH macro confliciting with TRASH in my_sys.h


mysys/my_alloc.c:
  Rename TRASH to TRASH_MEM and use the TRASH macro from my_sys.h
This commit is contained in:
unknown
2005-09-05 12:09:35 +02:00
parent 7a0f593dac
commit a0ea35da30
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysys/my_alloc.c
View File

@@ -221,11 +221,7 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size)
#endif
}
#ifdef SAFEMALLOC
#define TRASH(X) bfill(((char*)(X) + ((X)->size-(X)->left)), (X)->left, 0xa5)
#else
#define TRASH /* no-op */
#endif
#define TRASH_MEM(X) TRASH(((char*)(X) + ((X)->size-(X)->left)), (X)->left)
/* Mark all data in blocks free for reusage */
@@ -239,7 +235,7 @@ static inline void mark_blocks_free(MEM_ROOT* root)
for (next= root->free; next; next= *(last= &next->next))
{
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
TRASH(next);
TRASH_MEM(next);
}
/* Combine the free and the used list */
@@ -249,7 +245,7 @@ static inline void mark_blocks_free(MEM_ROOT* root)
for (; next; next= next->next)
{
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
TRASH(next);
TRASH_MEM(next);
}
/* Now everything is set; Indicate that nothing is used anymore */
@@ -310,7 +306,7 @@ void free_root(MEM_ROOT *root, myf MyFlags)
{
root->free=root->pre_alloc;
root->free->left=root->pre_alloc->size-ALIGN_SIZE(sizeof(USED_MEM));
TRASH(root->pre_alloc);
TRASH_MEM(root->pre_alloc);
root->free->next=0;
}
root->block_num= 4;