mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f7d0dfd9e8
Cosmetic cleanups Don't call 'delete_elements' on copy_funcs as this causes elements to be freed twice mysys/hash.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/list.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/mf_iocache.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/mf_keycache.c: Changed %lx -> 0x%lx (for easier comparison of debug files) Changed debug messages to be more consistent with other mysys files. mysys/mf_keycaches.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_alloc.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_fopen.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_fstream.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_getwd.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_lib.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_lwrite.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_malloc.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_pread.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_read.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_realloc.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/my_write.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/safemalloc.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/thr_alarm.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/thr_lock.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/thr_mutex.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/tree.c: Changed %lx -> 0x%lx (for easier comparison of debug files) mysys/typelib.c: Changed %lx -> 0x%lx (for easier comparison of debug files) sql/examples/ha_archive.cc: Changed to return error number for some functions (instead of -1) Updated function comments & some other minor cleanups Ensure that free_share() and gzclose() are always called Use 'TRUE' and 'FALSE' instead of 'true' and 'false' Removed some compiler warnings sql/examples/ha_archive.h: Fixed to use new prototypes for records_in_range sql/sql_select.cc: Don't call 'delete_elements' on copy_funcs
95 lines
2.4 KiB
C
95 lines
2.4 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
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 Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
|
#undef SAFEMALLOC
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <m_string.h>
|
|
|
|
/* My memory allocator */
|
|
|
|
gptr my_malloc(unsigned int size, myf my_flags)
|
|
{
|
|
gptr point;
|
|
DBUG_ENTER("my_malloc");
|
|
DBUG_PRINT("my",("size: %u my_flags: %d",size, my_flags));
|
|
|
|
if (!size)
|
|
size=1; /* Safety */
|
|
if ((point = (char*)malloc(size)) == NULL)
|
|
{
|
|
my_errno=errno;
|
|
if (my_flags & MY_FAE)
|
|
error_handler_hook=fatal_error_handler_hook;
|
|
if (my_flags & (MY_FAE+MY_WME))
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),size);
|
|
if (my_flags & MY_FAE)
|
|
exit(1);
|
|
}
|
|
else if (my_flags & MY_ZEROFILL)
|
|
bzero(point,size);
|
|
DBUG_PRINT("exit",("ptr: 0x%lx",point));
|
|
DBUG_RETURN(point);
|
|
} /* my_malloc */
|
|
|
|
|
|
/* Free memory allocated with my_malloc */
|
|
/*ARGSUSED*/
|
|
|
|
void my_no_flags_free(gptr ptr)
|
|
{
|
|
DBUG_ENTER("my_free");
|
|
DBUG_PRINT("my",("ptr: 0x%lx",ptr));
|
|
if (ptr)
|
|
free(ptr);
|
|
DBUG_VOID_RETURN;
|
|
} /* my_free */
|
|
|
|
|
|
/* malloc and copy */
|
|
|
|
gptr my_memdup(const byte *from, uint length, myf my_flags)
|
|
{
|
|
gptr ptr;
|
|
if ((ptr=my_malloc(length,my_flags)) != 0)
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
return(ptr);
|
|
}
|
|
|
|
|
|
char *my_strdup(const char *from, myf my_flags)
|
|
{
|
|
gptr ptr;
|
|
uint length=(uint) strlen(from)+1;
|
|
if ((ptr=my_malloc(length,my_flags)) != 0)
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
return((my_string) ptr);
|
|
}
|
|
|
|
|
|
char *my_strdup_with_length(const byte *from, uint length, myf my_flags)
|
|
{
|
|
gptr ptr;
|
|
if ((ptr=my_malloc(length+1,my_flags)) != 0)
|
|
{
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
((char*) ptr)[length]=0;
|
|
}
|
|
return((char*) ptr);
|
|
}
|