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

added qse_getawknilval()

Browse Source 
prefixed many public functions with QSE_EXPORT
This commit is contained in:
hyung-hwan
2012-12-01 13:13:13 +00:00
parent 7dd9e67cd8
commit 120992a242
64 changed files with 1138 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qse/lib/awk/Awk.cpp
View File

@ -280,19 +280,19 @@ void Awk::Value::operator delete[] (void* ptr)
qse_awk_rtx_freemem ((*(Run**)p)->rtx, p);
}
Awk::Value::Value (): run (QSE_NULL), val (qse_awk_val_nil)
Awk::Value::Value (): run (QSE_NULL), val (qse_getawknilval())
{
cached.str.ptr = QSE_NULL;
cached.str.len = 0;
}
Awk::Value::Value (Run& run): run (&run), val (qse_awk_val_nil)
Awk::Value::Value (Run& run): run (&run), val (qse_getawknilval())
{
cached.str.ptr = QSE_NULL;
cached.str.len = 0;
}
Awk::Value::Value (Run* run): run (run), val (qse_awk_val_nil)
Awk::Value::Value (Run* run): run (run), val (qse_getawknilval())
{
cached.str.ptr = QSE_NULL;
cached.str.len = 0;
@ -355,7 +355,7 @@ void Awk::Value::clear ()
}
run = QSE_NULL;
val = qse_awk_val_nil;
val = qse_getawknilval();
}
}

2
qse/lib/awk/Makefile.am
View File

@ -22,6 +22,6 @@ if ENABLE_CXX
lib_LTLIBRARIES += libqseawkxx.la
libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp
libqseawkxx_la_LDFLAGS = -L. -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
libqseawkxx_la_LIBADD = -lqseawk -lqsecmn $(LIBM) $(LIBLTDL)
libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqsecmn $(LIBM) $(LIBLTDL)
endif

2
qse/lib/awk/Makefile.in
View File

@ -310,7 +310,7 @@ libqseawk_la_LDFLAGS = -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
libqseawk_la_LIBADD = -lqsecmn $(LIBM) $(LIBLTDL)
@ENABLE_CXX_TRUE@libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp
@ENABLE_CXX_TRUE@libqseawkxx_la_LDFLAGS = -L. -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmn $(LIBM) $(LIBLTDL)
@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqsecmn $(LIBM) $(LIBLTDL)
all: all-am
.SUFFIXES:

5
qse/lib/awk/val.c
View File

@ -63,6 +63,11 @@ qse_awk_val_t* qse_awk_val_negone = (qse_awk_val_t*)&awk_int[0];
qse_awk_val_t* qse_awk_val_zero = (qse_awk_val_t*)&awk_int[1];
qse_awk_val_t* qse_awk_val_one = (qse_awk_val_t*)&awk_int[2];
qse_awk_val_t* qse_getawknilval (void)
{
return (qse_awk_val_t*)&awk_nil;
}
int qse_awk_rtx_isnilval (qse_awk_rtx_t* rtx, qse_awk_val_t* val)
{
return val->type == QSE_AWK_VAL_NIL;

12
qse/lib/cmn/dll.c
View File

@ -21,8 +21,6 @@
#include <qse/cmn/dll.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (dll)
#define TOB(dll,len) ((len)*(dll)->scale)
#define DPTR(node) QSE_DLL_DPTR(node)
#define DLEN(node) QSE_DLL_DLEN(node)
@ -90,6 +88,16 @@ void qse_dll_fini (qse_dll_t* dll)
qse_dll_clear (dll);
}
qse_mmgr_t* qse_dll_getmmgr (qse_dll_t* dll)
{
return dll->mmgr;
}
void* qse_dll_getxtn (qse_dll_t* dll)
{
return QSE_XTN (dll);
}
int qse_dll_getscale (qse_dll_t* dll)
{
return dll->scale;

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

@ -21,8 +21,6 @@
#include <qse/cmn/fma.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (fma)
qse_fma_t* qse_fma_open (
qse_mmgr_t* mmgr, qse_size_t xtnsize,
qse_size_t blksize, qse_size_t maxblks, qse_size_t maxcnks)
@ -77,6 +75,16 @@ void qse_fma_fini (qse_fma_t* fma)
}
}
qse_mmgr_t* qse_fma_getmmgr (qse_fma_t* fma)
{
return fma->mmgr;
}
void* qse_fma_getxtn (qse_fma_t* fma)
{
return QSE_XTN (fma);
}
static QSE_INLINE qse_fma_cnk_t* add_chunk (qse_fma_t* fma)
{
qse_fma_cnk_t* cnk;
@ -131,7 +139,7 @@ void* qse_fma_alloc (qse_fma_t* fma, qse_size_t size)
void* qse_fma_calloc (qse_fma_t* fma, qse_size_t size)
{
void* ptr = qse_fma_alloc (fma, size);
if (size) QSE_MEMSET (ptr, 0, size);
if (ptr) QSE_MEMSET (ptr, 0, size);
return ptr;
}

12
qse/lib/cmn/fs.c
View File

@ -52,8 +52,6 @@ struct info_t
#endif
};
QSE_IMPLEMENT_COMMON_FUNCTIONS (fs)
qse_fs_t* qse_fs_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
{
qse_fs_t* fs;
@ -132,6 +130,16 @@ void qse_fs_fini (qse_fs_t* fs)
}
}
qse_mmgr_t* qse_fs_getmmgr (qse_fs_t* fs)
{
return fs->mmgr;
}
void* qse_fs_getxtn (qse_fs_t* fs)
{
return QSE_XTN (fs);
}
static QSE_INLINE info_t* get_info (qse_fs_t* fs)
{
info_t* info;

11
qse/lib/cmn/htb.c
View File

@ -21,7 +21,6 @@
#include <qse/cmn/htb.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (htb)
#define htb_t qse_htb_t
#define pair_t qse_htb_pair_t
@ -329,6 +328,16 @@ void qse_htb_fini (htb_t* htb)
QSE_MMGR_FREE (htb->mmgr, htb->bucket);
}
qse_mmgr_t* qse_htb_getmmgr (qse_htb_t* htb)
{
return htb->mmgr;
}
void* qse_htb_getxtn (qse_htb_t* htb)
{
return QSE_XTN (htb);
}
const mancbs_t* qse_htb_getmancbs (const htb_t* htb)
{
return htb->mancbs;

12
qse/lib/cmn/lda.c
View File

@ -21,8 +21,6 @@
#include <qse/cmn/lda.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (lda)
#define lda_t qse_lda_t
#define slot_t qse_lda_slot_t
#define copier_t qse_lda_copier_t
@ -143,6 +141,16 @@ void qse_lda_fini (lda_t* lda)
}
}
qse_mmgr_t* qse_lda_getmmgr (qse_lda_t* lda)
{
return lda->mmgr;
}
void* qse_lda_getxtn (qse_lda_t* lda)
{
return QSE_XTN (lda);
}
int qse_lda_getscale (lda_t* lda)
{
return lda->scale;

93
qse/lib/cmn/nwio.c
View File

@ -43,11 +43,11 @@
# include <sys/time.h>
#endif
QSE_IMPLEMENT_COMMON_FUNCTIONS (nwio)
enum
{
STATUS_UDP_CONNECT = (1 << 0)
STATUS_UDP_CONNECT = (1 << 0),
STATUS_TMOUT_R_PRESET = (1 << 1),
STATUS_TMOUT_W_PRESET = (1 << 2)
};
static qse_ssize_t socket_output (
@ -250,17 +250,17 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what)
return -1;
#else
fd_set fds[2];
struct timeval tv;
FD_ZERO (&fds[0]);
FD_ZERO (&fds[1]);
FD_SET (nwio->handle, &fds[what]);
tv.tv_sec = tmout->sec;
tv.tv_usec = QSE_NSEC_TO_USEC (tmout->nsec);
FD_ZERO (&fds[0]);
FD_ZERO (&fds[1]);
FD_SET (nwio->handle, &fds[what]);
xret = select (nwio->handle + 1, &fds[0], &fds[1], QSE_NULL, &tv);
if (xret <= -1)
{
@ -302,6 +302,54 @@ void qse_nwio_close (qse_nwio_t* nwio)
QSE_MMGR_FREE (nwio->mmgr, nwio);
}
static int preset_tmout (qse_nwio_t* nwio)
{
#if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO)
#if defined(_WIN32)
DWORD tv;
#else
struct timeval tv;
#endif
if (TMOUT_ENABLED(nwio->tmout.r))
{
#if defined(_WIN32)
tv = QSE_SEC_TO_MSEC(nwio->tmout.r.sec) + QSE_NSEC_TO_MSEC (nwio->tmout.r.nsec);
#else
tv.tv_sec = nwio->tmout.r.sec;
tv.tv_usec = QSE_NSEC_TO_USEC (nwio->tmout.r.nsec);
#endif
if (setsockopt (nwio->handle, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, QSE_SIZEOF(tv)) <= -1)
{
return -1; /* tried to set but failed */
}
nwio->status |= STATUS_TMOUT_R_PRESET;
}
if (TMOUT_ENABLED(nwio->tmout.w))
{
#if defined(_WIN32)
tv = QSE_SEC_TO_MSEC(nwio->tmout.w.sec) + QSE_NSEC_TO_MSEC (nwio->tmout.w.nsec);
#else
tv.tv_sec = nwio->tmout.w.sec;
tv.tv_usec = QSE_NSEC_TO_USEC (nwio->tmout.w.nsec);
#endif
if (setsockopt (nwio->handle, SOL_SOCKET, SO_SNDTIMEO, (void*)&tv, QSE_SIZEOF(tv)) <= -1)
{
return -1; /* tried to set but failed */
}
nwio->status |= STATUS_TMOUT_W_PRESET;
}
return 1; /* set successfully - don't need a multiplexer */
#endif
return 0; /* no measn to set it */
}
int qse_nwio_init (
qse_nwio_t* nwio, qse_mmgr_t* mmgr, const qse_nwad_t* nwad,
int flags, const qse_nwio_tmout_t* tmout)
@ -730,6 +778,7 @@ int qse_nwio_init (
}
}
preset_tmout (nwio);
return 0;
oops:
@ -775,6 +824,16 @@ void qse_nwio_fini (qse_nwio_t* nwio)
#endif
}
qse_mmgr_t* qse_nwio_getmmgr (qse_nwio_t* nwio)
{
return nwio->mmgr;
}
void* qse_nwio_getxtn (qse_nwio_t* nwio)
{
return QSE_XTN (nwio);
}
qse_nwio_errnum_t qse_nwio_geterrnum (const qse_nwio_t* nwio)
{
return nwio->errnum;
@ -881,7 +940,8 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size)
}
else
{
if (TMOUT_ENABLED(nwio->tmout.r) &&
if (!(nwio->status & STATUS_TMOUT_R_PRESET) &&
TMOUT_ENABLED(nwio->tmout.r) &&
wait_for_data (nwio, &nwio->tmout.r, 0) <= -1) return -1;
count = recv (nwio->handle, buf, size, 0);
@ -925,7 +985,8 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size)
}
else
{
if (TMOUT_ENABLED(nwio->tmout.r) &&
if (!(nwio->status & STATUS_TMOUT_R_PRESET) &&
TMOUT_ENABLED(nwio->tmout.r) &&
wait_for_data (nwio, &nwio->tmout.r, 0) <= -1) return -1;
n = recv (nwio->handle, buf, size, 0);
@ -994,7 +1055,8 @@ reread:
}
else
{
if (TMOUT_ENABLED(nwio->tmout.r) &&
if (!(nwio->status & STATUS_TMOUT_R_PRESET) &&
TMOUT_ENABLED(nwio->tmout.r) &&
wait_for_data (nwio, &nwio->tmout.r, 0) <= -1) return -1;
n = recv (nwio->handle, buf, size, 0);
@ -1051,7 +1113,8 @@ static qse_ssize_t nwio_write (qse_nwio_t* nwio, const void* data, qse_size_t si
if (size > (QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(int)))
size = QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(int);
if (TMOUT_ENABLED(nwio->tmout.w) &&
if (!(nwio->status & STATUS_TMOUT_W_PRESET) &&
TMOUT_ENABLED(nwio->tmout.w) &&
wait_for_data (nwio, &nwio->tmout.w, 1) <= -1) return -1;
count = send (nwio->handle, data, size, 0);
@ -1063,7 +1126,8 @@ static qse_ssize_t nwio_write (qse_nwio_t* nwio, const void* data, qse_size_t si
if (size > (QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(int)))
size = QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(int);
if (TMOUT_ENABLED(nwio->tmout.w) &&
if (!(nwio->status & STATUS_TMOUT_W_PRESET) &&
TMOUT_ENABLED(nwio->tmout.w) &&
wait_for_data (nwio, &nwio->tmout.w, 1) <= -1) return -1;
n = send (nwio->handle, data, size, 0);
@ -1081,7 +1145,8 @@ static qse_ssize_t nwio_write (qse_nwio_t* nwio, const void* data, qse_size_t si
size = QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(size_t);
rewrite:
if (TMOUT_ENABLED(nwio->tmout.w) &&
if (!(nwio->status & STATUS_TMOUT_W_PRESET) &&
TMOUT_ENABLED(nwio->tmout.w) &&
wait_for_data (nwio, &nwio->tmout.w, 1) <= -1) return -1;
n = send (nwio->handle, data, size, 0);

12
qse/lib/cmn/oht.c
View File

@ -4,8 +4,6 @@
#define DATA_PTR(oht,index) \
((void*)(((qse_byte_t*)(oht)->data) + ((index) * (oht)->scale)))
QSE_IMPLEMENT_COMMON_FUNCTIONS (oht)
static QSE_INLINE_ALWAYS qse_size_t default_hasher (
qse_oht_t* oht, const void* data)
{
@ -110,6 +108,16 @@ void qse_oht_fini (qse_oht_t* oht)
oht->size = 0;
}
qse_mmgr_t* qse_oht_getmmgr (qse_oht_t* oht)
{
return oht->mmgr;
}
void* qse_oht_getxtn (qse_oht_t* oht)
{
return QSE_XTN (oht);
}
qse_oht_hasher_t qse_oht_gethasher (qse_oht_t* oht)
{
return oht->hasher? oht->hasher: default_hasher;

31
qse/lib/cmn/pio.c
View File

@ -40,8 +40,6 @@
# endif
#endif
QSE_IMPLEMENT_COMMON_FUNCTIONS (pio)
static qse_ssize_t pio_input (
qse_tio_t* tio, qse_tio_cmd_t cmd, void* buf, qse_size_t size);
static qse_ssize_t pio_output (
@ -191,18 +189,23 @@ static qse_pio_errnum_t tio_errnum_to_pio_errnum (qse_tio_t* tio)
}
qse_pio_t* qse_pio_open (
qse_mmgr_t* mmgr, qse_size_t ext,
qse_mmgr_t* mmgr, qse_size_t xtnsize,
const qse_char_t* cmd, qse_env_t* env, int flags)
{
qse_pio_t* pio;
pio = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_pio_t) + ext);
if (pio == QSE_NULL) return QSE_NULL;
if (qse_pio_init (pio, mmgr, cmd, env, flags) <= -1)
pio = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_pio_t) + xtnsize);
if (pio)
{
QSE_MMGR_FREE (mmgr, pio);
return QSE_NULL;
if (qse_pio_init (pio, mmgr, cmd, env, flags) <= -1)
{
QSE_MMGR_FREE (mmgr, pio);
pio = QSE_NULL;
}
else
{
QSE_MEMSET (pio + 1, 0, xtnsize);
}
}
return pio;
@ -1965,6 +1968,16 @@ void qse_pio_fini (qse_pio_t* pio)
qse_pio_wait (pio);
}
qse_mmgr_t* qse_pio_getmmgr (qse_pio_t* pio)
{
return pio->mmgr;
}
void* qse_pio_getxtn (qse_pio_t* pio)
{
return QSE_XTN (pio);
}
qse_pio_errnum_t qse_pio_geterrnum (const qse_pio_t* pio)
{
return pio->errnum;

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

@ -47,8 +47,6 @@
(QSE_SIZEOF(type) - (((qse_uintptr_t)ptr) % QSE_SIZEOF(type))) : 0)
QSE_IMPLEMENT_COMMON_FUNCTIONS (pma)
qse_pma_t* qse_pma_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
{
qse_pma_t* pma;
@ -85,6 +83,16 @@ void qse_pma_fini (qse_pma_t* pma)
qse_pma_clear (pma);
}
qse_mmgr_t* qse_pma_getmmgr (qse_pma_t* pma)
{
return pma->mmgr;
}
void* qse_pma_getxtn (qse_pma_t* pma)
{
return QSE_XTN (pma);
}
void qse_pma_clear (qse_pma_t* pma)
{
qse_mmgr_t* mmgr = pma->mmgr;
@ -152,7 +160,7 @@ void* qse_pma_alloc (qse_pma_t* pma, qse_size_t size)
void* qse_pma_calloc (qse_pma_t* pma, qse_size_t size)
{
void* ptr = qse_pma_alloc (pma, size);
if (size) QSE_MEMSET (ptr, 0, size);
if (ptr) QSE_MEMSET (ptr, 0, size);
return ptr;
}

12
qse/lib/cmn/rbt.c
View File

@ -21,8 +21,6 @@
#include <qse/cmn/rbt.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (rbt)
#define rbt_t qse_rbt_t
#define pair_t qse_rbt_pair_t
#define id_t qse_rbt_id_t
@ -249,6 +247,16 @@ void qse_rbt_fini (rbt_t* rbt)
qse_rbt_clear (rbt);
}
qse_mmgr_t* qse_rbt_getmmgr (qse_rbt_t* rbt)
{
return rbt->mmgr;
}
void* qse_rbt_getxtn (qse_rbt_t* rbt)
{
return QSE_XTN (rbt);
}
const mancbs_t* qse_rbt_getmancbs (const rbt_t* rbt)
{
return rbt->mancbs;

12
qse/lib/cmn/rex.c
View File

@ -116,8 +116,6 @@ struct cand_t
const qse_char_t* mptr;
};
QSE_IMPLEMENT_COMMON_FUNCTIONS (rex)
int qse_rex_init (qse_rex_t* rex, qse_mmgr_t* mmgr, qse_rex_node_t* code)
{
QSE_MEMSET (rex, 0, QSE_SIZEOF(*rex));
@ -193,6 +191,16 @@ void qse_rex_close (qse_rex_t* rex)
QSE_MMGR_FREE (rex->mmgr, rex);
}
qse_mmgr_t* qse_rex_getmmgr (qse_rex_t* rex)
{
return rex->mmgr;
}
void* qse_rex_getxtn (qse_rex_t* rex)
{
return QSE_XTN (rex);
}
qse_rex_node_t* qse_rex_yield (qse_rex_t* rex)
{
qse_rex_node_t* code = rex->code;

10
qse/lib/cmn/sio.c
View File

@ -226,6 +226,16 @@ void qse_sio_fini (qse_sio_t* sio)
qse_fio_fini (&sio->file);
}
qse_mmgr_t* qse_sio_getmmgr (qse_sio_t* sio)
{
return sio->mmgr;
}
void* qse_sio_getxtn (qse_sio_t* sio)
{
return QSE_XTN (sio);
}
qse_sio_errnum_t qse_sio_geterrnum (const qse_sio_t* sio)
{
return sio->errnum;

12
qse/lib/cmn/sll.c
View File

@ -21,8 +21,6 @@
#include <qse/cmn/sll.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (sll)
#define sll_t qse_sll_t
#define node_t qse_sll_node_t
#define copier_t qse_sll_copier_t
@ -141,6 +139,16 @@ void qse_sll_fini (sll_t* sll)
qse_sll_clear (sll);
}
qse_mmgr_t* qse_sll_getmmgr (qse_sll_t* sll)
{
return sll->mmgr;
}
void* qse_sll_getxtn (qse_sll_t* sll)
{
return QSE_XTN (sll);
}
int qse_sll_getscale (sll_t* sll)
{
return sll->scale;

32
qse/lib/cmn/str-dynm.c
View File

@ -21,21 +21,23 @@
#include <qse/cmn/str.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (mbs)
qse_mbs_t* qse_mbs_open (qse_mmgr_t* mmgr, qse_size_t ext, qse_size_t capa)
qse_mbs_t* qse_mbs_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_size_t capa)
{
qse_mbs_t* str;
str = (qse_mbs_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_mbs_t) + ext);
if (str == QSE_NULL) return QSE_NULL;
if (qse_mbs_init (str, mmgr, capa) <= -1)
str = (qse_mbs_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_mbs_t) + xtnsize);
if (str)
{
QSE_MMGR_FREE (mmgr, str);
return QSE_NULL;
if (qse_mbs_init (str, mmgr, capa) <= -1)
{
QSE_MMGR_FREE (mmgr, str);
str = QSE_NULL;
}
else
{
QSE_MEMSET (str + 1, 0, xtnsize);
}
}
return str;
}
@ -72,6 +74,16 @@ void qse_mbs_fini (qse_mbs_t* str)
if (str->val.ptr != QSE_NULL) QSE_MMGR_FREE (str->mmgr, str->val.ptr);
}
qse_mmgr_t* qse_mbs_getmmgr (qse_mbs_t* mbs)
{
return mbs->mmgr;
}
void* qse_mbs_getxtn (qse_mbs_t* mbs)
{
return QSE_XTN (mbs);
}
int qse_mbs_yield (qse_mbs_t* str, qse_mxstr_t* buf, qse_size_t newcapa)
{
qse_mchar_t* tmp;

32
qse/lib/cmn/str-dynw.c
View File

@ -21,21 +21,23 @@
#include <qse/cmn/str.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (wcs)
qse_wcs_t* qse_wcs_open (qse_mmgr_t* mmgr, qse_size_t ext, qse_size_t capa)
qse_wcs_t* qse_wcs_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_size_t capa)
{
qse_wcs_t* str;
str = (qse_wcs_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_wcs_t) + ext);
if (str == QSE_NULL) return QSE_NULL;
if (qse_wcs_init (str, mmgr, capa) <= -1)
str = (qse_wcs_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_wcs_t) + xtnsize);
if (str)
{
QSE_MMGR_FREE (mmgr, str);
return QSE_NULL;
if (qse_wcs_init (str, mmgr, capa) <= -1)
{
QSE_MMGR_FREE (mmgr, str);
str = QSE_NULL;
}
else
{
QSE_MEMSET (str + 1, 0, xtnsize);
}
}
return str;
}
@ -72,6 +74,16 @@ void qse_wcs_fini (qse_wcs_t* str)
if (str->val.ptr != QSE_NULL) QSE_MMGR_FREE (str->mmgr, str->val.ptr);
}
qse_mmgr_t* qse_wcs_getmmgr (qse_wcs_t* wcs)
{
return wcs->mmgr;
}
void* qse_wcs_getxtn (qse_wcs_t* wcs)
{
return QSE_XTN (wcs);
}
int qse_wcs_yield (qse_wcs_t* str, qse_wxstr_t* buf, qse_size_t newcapa)
{
qse_wchar_t* tmp;

12
qse/lib/cmn/tio.c
View File

@ -22,8 +22,6 @@
#include <qse/cmn/mbwc.h>
#include "mem.h"
QSE_IMPLEMENT_COMMON_FUNCTIONS (tio)
#define STATUS_OUTPUT_DYNBUF (1 << 0)
#define STATUS_INPUT_DYNBUF (1 << 1)
#define STATUS_INPUT_ILLSEQ (1 << 2)
@ -92,6 +90,16 @@ int qse_tio_fini (qse_tio_t* tio)
return ret;
}
qse_mmgr_t* qse_tio_getmmgr (qse_tio_t* tio)
{
return tio->mmgr;
}
void* qse_tio_getxtn (qse_tio_t* tio)
{
return QSE_XTN (tio);
}
qse_tio_errnum_t qse_tio_geterrnum (const qse_tio_t* tio)
{
return tio->errnum;

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

@ -22,8 +22,6 @@
#include "tre-compile.h"
#include <qse/cmn/str.h>
QSE_IMPLEMENT_COMMON_FUNCTIONS (tre)
qse_tre_t* qse_tre_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
{
qse_tre_t* tre;
@ -64,6 +62,16 @@ void qse_tre_fini (qse_tre_t* tre)
}
}
qse_mmgr_t* qse_tre_getmmgr (qse_tre_t* tre)
{
return tre->mmgr;
}
void* qse_tre_getxtn (qse_tre_t* tre)
{
return QSE_XTN (tre);
}
int qse_tre_compx (
qse_tre_t* tre, const qse_char_t* regex, qse_size_t n,
unsigned int* nsubmat, int cflags)

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

@ -525,7 +525,7 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
void* qse_xma_calloc (qse_xma_t* xma, qse_size_t size)
{
void* ptr = qse_xma_alloc (xma, size);
if (size) QSE_MEMSET (ptr, 0, size);
if (ptr) QSE_MEMSET (ptr, 0, size);
return ptr;
}

2
qse/lib/sed/Makefile.am
View File

@ -14,6 +14,6 @@ if ENABLE_CXX
lib_LTLIBRARIES += libqsesedxx.la
libqsesedxx_la_SOURCES = Sed.cpp StdSed.cpp
libqsesedxx_la_LDFLAGS = -L. -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
libqsesedxx_la_LIBADD = -lqsesed -lqsecmn
libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsecmn
endif

2
qse/lib/sed/Makefile.in
View File

@ -304,7 +304,7 @@ libqsesed_la_LDFLAGS = -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
libqsesed_la_LIBADD = -lqsecmn
@ENABLE_CXX_TRUE@libqsesedxx_la_SOURCES = Sed.cpp StdSed.cpp
@ENABLE_CXX_TRUE@libqsesedxx_la_LDFLAGS = -L. -L../cmn -L$(libdir) -version-info 1:0:0 -no-undefined
@ENABLE_CXX_TRUE@libqsesedxx_la_LIBADD = -lqsesed -lqsecmn
@ENABLE_CXX_TRUE@libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsecmn
all: all-am
.SUFFIXES:

2
qse/lib/stx/stx.h
View File

@ -88,7 +88,7 @@ struct qse_stx_charobj_t
struct qse_stx_t
{
QSE_DEFINE_COMMON_FIELDS (stx)
qse_mmgr_t* mmgr;
/** error information */
struct