This commit is contained in:
2008-08-19 05:21:48 +00:00
parent 63014b5fc8
commit 3cbefaa12c
37 changed files with 465 additions and 544 deletions

View File

@ -13,22 +13,30 @@ void* ase_dll_copyinline (ase_dll_t* dll, void* dptr, ase_size_t dlen)
return ASE_NULL;
}
ase_dll_t* ase_dll_open (ase_mmgr_t* mmgr)
{
return ase_dll_openx (mmgr, 0, ASE_NULL);
}
ase_dll_t* ase_dll_openx (ase_mmgr_t* mmgr, ase_size_t extension, ase_fuser_t fuser)
ase_dll_t* ase_dll_open (
ase_mmgr_t* mmgr, ase_size_t extension,
void (*initializer) (ase_dll_t*))
{
ase_dll_t* dll;
if (mmgr == ASE_NULL)
{
mmgr = ASE_MMGR_GETDFL();
ASE_ASSERTX (mmgr != ASE_NULL,
"Set the memory manager with ASE_MMGR_SETDFL()");
if (mmgr == ASE_NULL) return ASE_NULL;
}
dll = ASE_MALLOC (mmgr, ASE_SIZEOF(ase_dll_t) + extension);
if (dll == ASE_NULL) return ASE_NULL;
ASE_MEMSET (dll, 0, ASE_SIZEOF(ase_dll_t) + extension);
if (fuser != ASE_NULL) mmgr = fuser (mmgr, dll + 1);
dll->mmgr = mmgr;
if (initializer) initializer (dll);
return dll;
}
@ -49,6 +57,16 @@ void* ase_dll_getextension (ase_dll_t* dll)
return dll + 1;
}
ase_mmgr_t* ase_dll_getmmgr (ase_dll_t* dll)
{
return dll->mmgr;
}
void ase_dll_setmmgr (ase_dll_t* dll, ase_mmgr_t* mmgr)
{
dll->mmgr = mmgr;
}
ase_size_t ase_dll_getsize (ase_dll_t* dll)
{
return dll->size;

View File

@ -1,11 +1,12 @@
/*
* $Id: map.c 156 2008-03-22 12:09:35Z baconevi $
* $Id: map.c 332 2008-08-18 11:21:48Z baconevi $
*
* {License}
*/
#include <ase/cmn/map.h>
#include <ase/cmn/str.h>
#include "mem.h"
static ase_size_t hashkey (const ase_char_t* keyptr, ase_size_t keylen);
static int rehash (ase_map_t* map);

View File

@ -1,11 +1,11 @@
/*
* $Id: rex.c 223 2008-06-26 06:44:41Z baconevi $
* $Id: rex.c 332 2008-08-18 11:21:48Z baconevi $
*
* {License}
*/
#include <ase/cmn/rex.h>
#include <ase/cmn/mem.h>
#include "mem.h"
#ifdef DEBUG_REX
#include <ase/utl/stdio.h>
@ -1108,7 +1108,7 @@ static int add_code (builder_t* builder, void* data, ase_size_t len)
if (builder->code.buf != ASE_NULL)
{
ase_memcpy (tmp, builder->code.buf, builder->code.capa);
ASE_MEMCPY (tmp, builder->code.buf, builder->code.capa);
ASE_FREE (builder->mmgr, builder->code.buf);
}
}
@ -1117,7 +1117,7 @@ static int add_code (builder_t* builder, void* data, ase_size_t len)
builder->code.capa = capa;
}
ase_memcpy (&builder->code.buf[builder->code.size], data, len);
ASE_MEMCPY (&builder->code.buf[builder->code.size], data, len);
builder->code.size += len;
return 0;

View File

@ -13,27 +13,21 @@ void* ase_sll_copyinline (ase_sll_t* sll, void* dptr, ase_size_t dlen)
return ASE_NULL;
}
ase_sll_t* ase_sll_open (void)
{
return ase_sll_openx (ASE_MMGR_GETDFLMMGR(), 0, ASE_NULL);
}
ase_sll_openm (ase_mmgr_t* mmgr)
{
return ase_sll_openx (mmgr, 0, ASE_NULL);
}
ase_sll_openx (ase_size_t extension, ase_fuser_t initializer)
{
return ase_sll_openx (mmgr, 0, ASE_NULL);
}
ase_sll_t* ase_sll_openmx (
ase_mmgr_t* mmgr, ase_size_t extension, ase_fuser_t initializer)
ase_sll_t* ase_sll_open (
ase_mmgr_t* mmgr, ase_size_t extension,
void (*initializer) (ase_sll_t*))
{
ase_sll_t* sll;
if (mmgr == ASE_NULL) mmgr = ASE_MMGR_GET ();
if (mmgr == ASE_NULL)
{
mmgr = ASE_MMGR_GETDFL();
ASE_ASSERTX (mmgr != ASE_NULL,
"Set the memory manager with ASE_MMGR_SETDFL()");
if (mmgr == ASE_NULL) return ASE_NULL;
}
sll = ASE_MALLOC (mmgr, ASE_SIZEOF(ase_sll_t) + extension);
if (sll == ASE_NULL) return ASE_NULL;
@ -41,7 +35,7 @@ ase_sll_t* ase_sll_openmx (
ASE_MEMSET (sll, 0, ASE_SIZEOF(ase_sll_t) + extension);
sll->mmgr = mmgr;
if (initializer != ASE_NULL) mmgr = initializer (sll, sll + 1);
if (initializer) initializer (sll);
return sll;
}
@ -63,6 +57,16 @@ void* ase_sll_getextension (ase_sll_t* sll)
return sll + 1;
}
ase_mmgr_t* ase_sll_getmmgr (ase_sll_t* sll)
{
return sll->mmgr;
}
void ase_sll_setmmgr (ase_sll_t* sll, ase_mmgr_t* mmgr)
{
sll->mmgr = mmgr;
}
ase_size_t ase_sll_getsize (ase_sll_t* sll)
{
return sll->size;

View File

@ -1,11 +1,11 @@
/*
* $Id: str_bas.c 197 2008-06-09 06:24:10Z baconevi $
* $Id: str_bas.c 332 2008-08-18 11:21:48Z baconevi $
*
* {License}
*/
#include <ase/cmn/str.h>
#include <ase/cmn/mem.h>
#include "mem.h"
ase_size_t ase_strlen (const ase_char_t* str)
{
@ -80,7 +80,7 @@ ase_size_t ase_strxncpy (
if (bsz <= 0) return 0;
if ((n = bsz - 1) > len) n = len;
ase_memcpy (buf, str, n * ASE_SIZEOF(ase_char_t));
ASE_MEMCPY (buf, str, n * ASE_SIZEOF(ase_char_t));
buf[n] = ASE_T('\0');
return n;

View File

@ -1,11 +1,10 @@
/*
* $Id: str_cnv.c 142 2008-03-18 06:29:25Z baconevi $
* $Id: str_cnv.c 332 2008-08-18 11:21:48Z baconevi $
*
* {License}
*/
#include <ase/cmn/str.h>
#include <ase/cmn/mem.h>
int ase_strtoi (const ase_char_t* str)
{

View File

@ -1,11 +1,11 @@
/*
* $Id: str_dyn.c 197 2008-06-09 06:24:10Z baconevi $
* $Id: str_dyn.c 332 2008-08-18 11:21:48Z baconevi $
*
* {License}
*/
#include <ase/cmn/str.h>
#include <ase/cmn/mem.h>
#include "mem.h"
ase_str_t* ase_str_open (ase_str_t* str, ase_size_t capa, ase_mmgr_t* mmgr)
{
@ -129,7 +129,7 @@ ase_size_t ase_str_ncat (ase_str_t* str, const ase_char_t* s, ase_size_t len)
if (tmp == ASE_NULL) return (ase_size_t)-1;
if (str->buf != ASE_NULL)
{
ase_memcpy (tmp, str->buf,
ASE_MEMCPY (tmp, str->buf,
ASE_SIZEOF(ase_char_t)*(str->capa+1));
ASE_FREE (str->mmgr, str->buf);
}