hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed a rounding bug of reallocation size in _realloc_merge of qse_xma_t.

Browse Source 
* replaced rex with tre in qse_sed_t
* added submatch reference for the 's' command into qse_sed_t
* changed some options and functions for tre integration in qse_sed_t
This commit is contained in:
hyung-hwan
2011-09-03 09:27:44 +00:00
parent 1efa41052e
commit 3fe32033cb
9 changed files with 265 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/lib/cmn/tre.c
View File

@ -47,7 +47,7 @@ qse_tre_t* qse_tre_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
return QSE_NULL;
}
return QSE_NULL;
return tre;
}
void qse_tre_close (qse_tre_t* tre)

14
qse/lib/cmn/xma.c
View File

@ -49,8 +49,8 @@ struct qse_xma_blk_t
struct
{
qse_xma_blk_t* prev; /**< link to the previous block */
qse_xma_blk_t* next; /**< link to the next block */
qse_xma_blk_t* prev; /**< link to the previous adjacent block */
qse_xma_blk_t* next; /**< link to the next adjacent block */
} b;
};
@ -379,7 +379,7 @@ void* qse_xma_alloc (qse_xma_t* xma, qse_size_t size)
for (++xfi; xfi < XFIMAX(xma) - 1; xfi++)
{
free = alloc_from_freelist (xma, xfi, size);
if (free != QSE_NULL) break;
if (free) break;
}
if (free == QSE_NULL) return QSE_NULL;
}
@ -392,16 +392,20 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
{
qse_xma_blk_t* blk = USR_TO_SYS(b);
/* rounds up 'size' to be multiples of ALIGN */
size = ((size + ALIGN - 1) / ALIGN) * ALIGN;
if (size > blk->size)
{
/*
* grow the current block
*/
qse_size_t req = size - blk->size;
qse_size_t req;
qse_xma_blk_t* n;
qse_size_t rem;
req = size - blk->size;
n = blk->b.next;
/* check if the next adjacent block is available */