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

renamed ASE_STR_XXX macros and added the ase_xstr_t type

Browse Source
This commit is contained in:
hyung-hwan
2008-09-24 03:51:24 +00:00
parent a1348d4ca5
commit 2230fbd445
9 changed files with 120 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ase/include/ase/cmn/str.h
View File

@ -1,5 +1,5 @@
/*
* $Id: str.h 371 2008-09-23 09:36:30Z baconevi $
* $Id: str.h 372 2008-09-23 09:51:24Z baconevi $
*
* {License}
*/
@ -10,12 +10,10 @@
#include <ase/types.h>
#include <ase/macros.h>
#define ASE_STR_LEN(x) ((x)->size)
#define ASE_STR_PTR(x) ((x)->buf)
#define ASE_STR_SIZE(x) ((x)->size + 1)
#define ASE_STR_LEN(x) ((x)->len)
#define ASE_STR_PTR(x) ((x)->ptr)
#define ASE_STR_CAPA(x) ((x)->capa)
#define ASE_STR_BUF(x) ((x)->buf)
#define ASE_STR_CHAR(x,idx) ((x)->buf[idx])
#define ASE_STR_CHAR(x,idx) ((x)->ptr[idx])
typedef struct ase_str_t ase_str_t;
@ -24,8 +22,8 @@ struct ase_str_t
ase_mmgr_t* mmgr;
ase_sizer_t sizer;
ase_char_t* buf;
ase_size_t size;
ase_char_t* ptr;
ase_size_t len;
ase_size_t capa;
};
@ -208,14 +206,14 @@ void ase_str_fini (
*
* DESCRIPTION:
* The ase_str_yield() function assigns the buffer to an variable of the
* ase_cstr_t type and recreate a new buffer of the new_capa capacity.
* ase_xstr_t type and recreate a new buffer of the new_capa capacity.
* The function fails if it fails to allocate a new buffer.
*
* RETURNS: 0 on success, -1 on failure.
*/
int ase_str_yield (
ase_str_t* str /* a dynamic string */,
ase_cstr_t* buf /* the pointer to a ase_cstr_t variable */,
ase_xstr_t* buf /* the pointer to a ase_xstr_t variable */,
int new_capa /* new capacity in number of characters */
);
@ -239,6 +237,8 @@ ase_sizer_t ase_str_getsizer (
* With no sizer specified, the dynamic string doubles the current buffer
* when it needs to increase its size. The sizer function is passed a dynamic
* string and the minimum capacity required to hold data after resizing.
* The string is truncated if the sizer function returns a smaller number
* than the hint passed.
*/
void ase_str_setsizer (
ase_str_t* str /* a dynamic string */,
@ -250,6 +250,7 @@ void ase_str_setsizer (
*
* DESCRIPTION:
* The ase_str_getcapa() function returns the current capacity.
* You may use ASE_STR_CAPA(str) macro for performance sake.
*
* RETURNS: the current capacity in number of characters.
*/

11
ase/include/ase/types.h
View File

@ -1,5 +1,5 @@
/*
* $Id: types.h 369 2008-09-22 11:21:08Z baconevi $
* $Id: types.h 372 2008-09-23 09:51:24Z baconevi $
*
* {License}
*/
@ -320,6 +320,7 @@ typedef int ase_mcint_t;
#endif
#endif
typedef struct ase_xstr_t ase_xstr_t;
typedef struct ase_cstr_t ase_cstr_t;
typedef struct ase_mmgr_t ase_mmgr_t;
typedef struct ase_ccls_t ase_ccls_t;
@ -331,9 +332,15 @@ typedef void (*ase_free_t) (void* data, void* ptr);
typedef ase_bool_t (*ase_isccls_t) (void* data, ase_cint_t c);
typedef ase_cint_t (*ase_toccls_t) (void* data, ase_cint_t c);
struct ase_xstr_t
{
ase_char_t* ptr; /* this is not a const pointer */
ase_size_t len;
};
struct ase_cstr_t
{
const ase_char_t* ptr;
const ase_char_t* ptr; /* this is a const pointer */
ase_size_t len;
};