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

renamed qse_xstr_t to qse_cstr_t

Browse Source
This commit is contained in:
hyung-hwan
2014-07-08 14:30:42 +00:00
parent 22444e298a
commit 36b20b4169
88 changed files with 454 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
typedef struct info_t info_t;
struct info_t
{
qse_xstr_t name;
qse_cstr_t name;
#if defined(_WIN32)
HANDLE handle;

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

@ -346,7 +346,7 @@ static int handle_non_wild_segments (glob_t* g, segment_t* seg)
/* if the segment contains escape sequences,
* strip the escape letters off the segment */
qse_xstr_t tmp;
qse_cstr_t tmp;
qse_size_t i;
int escaped = 0;

2
qse/lib/cmn/mbwc-str.c
View File

@ -577,7 +577,7 @@ qse_mchar_t* qse_wcsatombsdupwithcmgr (
}
qse_mchar_t* qse_wcsnatombsdupwithcmgr (
const qse_wxstr_t wcs[], qse_size_t* mbslen, qse_mmgr_t* mmgr, qse_cmgr_t* cmgr)
const qse_wcstr_t wcs[], qse_size_t* mbslen, qse_mmgr_t* mmgr, qse_cmgr_t* cmgr)
{
qse_size_t wl, ml, capa, pos, i;
qse_mchar_t* mbs;

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

@ -234,7 +234,7 @@ qse_mchar_t* qse_wcsatombsdup (
}
qse_mchar_t* qse_wcsnatombsdup (
const qse_wxstr_t wcs[], qse_size_t* mbslen, qse_mmgr_t* mmgr)
const qse_wcstr_t wcs[], qse_size_t* mbslen, qse_mmgr_t* mmgr)
{
return qse_wcsnatombsdupwithcmgr (wcs, mbslen, mmgr, dfl_cmgr);
}

4
qse/lib/cmn/nwad.c
View File

@ -61,7 +61,7 @@ int qse_mbsntonwad (const qse_mchar_t* str, qse_size_t len, qse_nwad_t* nwad)
{
const qse_mchar_t* p;
const qse_mchar_t* end;
qse_mxstr_t tmp;
qse_mcstr_t tmp;
qse_nwad_t tmpad;
QSE_MEMSET (&tmpad, 0, QSE_SIZEOF(tmpad));
@ -227,7 +227,7 @@ int qse_wcsntonwad (const qse_wchar_t* str, qse_size_t len, qse_nwad_t* nwad)
{
const qse_wchar_t* p;
const qse_wchar_t* end;
qse_wxstr_t tmp;
qse_wcstr_t tmp;
qse_nwad_t tmpad;
QSE_MEMSET (&tmpad, 0, QSE_SIZEOF(tmpad));

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

@ -33,7 +33,7 @@ struct comp_t
{
qse_rex_t* rex;
qse_xstr_t re;
qse_cstr_t re;
const qse_char_t* ptr;
const qse_char_t* end;
@ -490,7 +490,7 @@ else qse_printf (QSE_T("getc => %c\n"), com->c);
struct ccinfo_t
{
qse_xstr_t name;
qse_cstr_t name;
int (*func) (exec_t* e, qse_char_t c);
};
@ -1982,8 +1982,8 @@ static void fini_exec_dds (exec_t* e)
}
int qse_rex_exec (
qse_rex_t* rex, const qse_xstr_t* str,
const qse_xstr_t* substr, qse_xstr_t* matstr)
qse_rex_t* rex, const qse_cstr_t* str,
const qse_cstr_t* substr, qse_cstr_t* matstr)
{
exec_t e;
int n = 0;
@ -2061,8 +2061,8 @@ void* qse_buildrex (
int qse_matchrex (
qse_mmgr_t* mmgr, qse_size_t depth,
void* code, int option,
const qse_xstr_t* str, const qse_xstr_t* substr,
qse_xstr_t* match, qse_rex_errnum_t* errnum)
const qse_cstr_t* str, const qse_cstr_t* substr,
qse_cstr_t* match, qse_rex_errnum_t* errnum)
{
qse_rex_t rex;
int n;

8
qse/lib/cmn/str-dup.c
View File

@ -92,7 +92,7 @@ qse_mchar_t* qse_mbsadup (const qse_mchar_t* str[], qse_size_t* len, qse_mmgr_t*
return buf;
}
qse_mchar_t* qse_mcstrdup (const qse_mxstr_t* str, qse_mmgr_t* mmgr)
qse_mchar_t* qse_mcstrdup (const qse_mcstr_t* str, qse_mmgr_t* mmgr)
{
qse_mchar_t* buf;
@ -106,7 +106,7 @@ qse_mchar_t* qse_mcstrdup (const qse_mxstr_t* str, qse_mmgr_t* mmgr)
return buf;
}
qse_mchar_t* qse_mcstradup (const qse_mxstr_t str[], qse_size_t* len, qse_mmgr_t* mmgr)
qse_mchar_t* qse_mcstradup (const qse_mcstr_t str[], qse_size_t* len, qse_mmgr_t* mmgr)
{
qse_mchar_t* buf, * ptr;
qse_size_t i;
@ -201,7 +201,7 @@ qse_wchar_t* qse_wcsadup (const qse_wchar_t* str[], qse_size_t* len, qse_mmgr_t*
return buf;
}
qse_wchar_t* qse_wcstrdup (const qse_wxstr_t* str, qse_mmgr_t* mmgr)
qse_wchar_t* qse_wcstrdup (const qse_wcstr_t* str, qse_mmgr_t* mmgr)
{
qse_wchar_t* buf;
@ -215,7 +215,7 @@ qse_wchar_t* qse_wcstrdup (const qse_wxstr_t* str, qse_mmgr_t* mmgr)
return buf;
}
qse_wchar_t* qse_wcstradup (const qse_wxstr_t str[], qse_size_t* len, qse_mmgr_t* mmgr)
qse_wchar_t* qse_wcstradup (const qse_wcstr_t str[], qse_size_t* len, qse_mmgr_t* mmgr)
{
qse_wchar_t* buf, * ptr;
qse_size_t i;

8
qse/lib/cmn/str-dyn.c
View File

@ -97,7 +97,7 @@ static int mbs_to_wcs (
/* -------------------------------------------------------- */
#undef char_t
#undef xstr_t
#undef cstr_t
#undef str_sizer_t
#undef T
#undef strlen
@ -144,7 +144,7 @@ static int mbs_to_wcs (
#undef str_vfcat
#define char_t qse_mchar_t
#define xstr_t qse_mxstr_t
#define cstr_t qse_mcstr_t
#define str_sizer_t qse_mbs_sizer_t
#define T(x) QSE_MT(x)
#define strlen(x) qse_mbslen(x)
@ -194,7 +194,7 @@ static int mbs_to_wcs (
/* -------------------------------------------------------- */
#undef char_t
#undef xstr_t
#undef cstr_t
#undef str_sizer_t
#undef T
#undef strlen
@ -241,7 +241,7 @@ static int mbs_to_wcs (
#undef str_vfcat
#define char_t qse_wchar_t
#define xstr_t qse_wxstr_t
#define cstr_t qse_wcstr_t
#define str_sizer_t qse_wcs_sizer_t
#define T(x) QSE_WT(x)
#define strlen(x) qse_wcslen(x)

4
qse/lib/cmn/str-dyn.h
View File

@ -86,7 +86,7 @@ void* str_getxtn (str_t* mbs)
return QSE_XTN (mbs);
}
int str_yield (str_t* str, xstr_t* buf, qse_size_t newcapa)
int str_yield (str_t* str, cstr_t* buf, qse_size_t newcapa)
{
char_t* tmp;
@ -114,7 +114,7 @@ int str_yield (str_t* str, xstr_t* buf, qse_size_t newcapa)
char_t* str_yieldptr (str_t* str, qse_size_t newcapa)
{
xstr_t mx;
cstr_t mx;
if (str_yield (str, &mx, newcapa) <= -1) return QSE_NULL;
return mx.ptr;
}

8
qse/lib/cmn/str-fcpy.c
View File

@ -22,7 +22,7 @@
#undef T
#undef char_t
#undef xstr_t
#undef cstr_t
#undef strfcpy
#undef strfncpy
#undef strxfcpy
@ -30,7 +30,7 @@
#define T(x) QSE_MT(x)
#define char_t qse_mchar_t
#define xstr_t qse_mxstr_t
#define cstr_t qse_mcstr_t
#define strfcpy qse_mbsfcpy
#define strfncpy qse_mbsfncpy
#define strxfcpy qse_mbsxfcpy
@ -41,7 +41,7 @@
#undef T
#undef char_t
#undef xstr_t
#undef cstr_t
#undef strfcpy
#undef strfncpy
#undef strxfcpy
@ -49,7 +49,7 @@
#define T(x) QSE_WT(x)
#define char_t qse_wchar_t
#define xstr_t qse_wxstr_t
#define cstr_t qse_wcstr_t
#define strfcpy qse_wcsfcpy
#define strfncpy qse_wcsfncpy
#define strxfcpy qse_wcsxfcpy

4
qse/lib/cmn/str-fcpy.h
View File

@ -64,7 +64,7 @@ qse_size_t strfcpy (
}
qse_size_t strfncpy (
char_t* buf, const char_t* fmt, const xstr_t str[])
char_t* buf, const char_t* fmt, const cstr_t str[])
{
char_t* b = buf;
const char_t* f = fmt;
@ -181,7 +181,7 @@ fini:
qse_size_t strxfncpy (
char_t* buf, qse_size_t bsz,
const char_t* fmt, const xstr_t str[])
const char_t* fmt, const cstr_t str[])
{
char_t* b = buf;
char_t* end = buf + bsz - 1;

8
qse/lib/cmn/str-subst.c
View File

@ -23,7 +23,7 @@
/* ----------------------------------- */
#undef char_t
#undef xstr_t
#undef cstr_t
#undef T
#undef NOBUF
#undef strlen
@ -34,7 +34,7 @@
#undef strxnsubst
#define char_t qse_mchar_t
#define xstr_t qse_mxstr_t
#define cstr_t qse_mcstr_t
#define T(x) QSE_MT(x)
#define NOBUF QSE_MBSSUBST_NOBUF
#define strlen qse_mbslen
@ -48,7 +48,7 @@
/* ----------------------------------- */
#undef char_t
#undef xstr_t
#undef cstr_t
#undef T
#undef NOBUF
#undef strlen
@ -59,7 +59,7 @@
#undef strxnsubst
#define char_t qse_wchar_t
#define xstr_t qse_wxstr_t
#define cstr_t qse_wcstr_t
#define T(x) QSE_WT(x)
#define NOBUF QSE_WCSSUBST_NOBUF
#define strlen qse_wcslen

8
qse/lib/cmn/str-subst.h
View File

@ -18,12 +18,12 @@
License along with QSE. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(char_t) && !defined(xstr_t) && !defined(strxsubst)
#if !defined(char_t) && !defined(cstr_t) && !defined(strxsubst)
# error Never include this file
#endif
static const char_t* scan_dollar (
const char_t* f, qse_size_t l, xstr_t* ident, xstr_t* dfl, int depth)
const char_t* f, qse_size_t l, cstr_t* ident, cstr_t* dfl, int depth)
{
const char_t* end = f + l;
@ -89,7 +89,7 @@ static const char_t* scan_dollar (
}
static char_t* expand_dollar (
char_t* buf, qse_size_t bsz, const xstr_t* ident, const xstr_t* dfl,
char_t* buf, qse_size_t bsz, const cstr_t* ident, const cstr_t* dfl,
subst_t subst, void* ctx)
{
char_t* tmp;
@ -138,7 +138,7 @@ qse_size_t strxnsubst (
if (*(f + 1) == T('{'))
{
const char_t* tmp;
xstr_t ident, dfl;
cstr_t ident, dfl;
tmp = scan_dollar (f, fend - f, &ident, &dfl, 0);
if (tmp == QSE_NULL || ident.len <= 0) goto normal;

12
qse/lib/cmn/str-tok.c
View File

@ -22,7 +22,7 @@
#include <qse/cmn/chr.h>
qse_mchar_t* qse_mbstok (
const qse_mchar_t* s, const qse_mchar_t* delim, qse_mxstr_t* tok)
const qse_mchar_t* s, const qse_mchar_t* delim, qse_mcstr_t* tok)
{
const qse_mchar_t* p = s, *d;
const qse_mchar_t* sp = QSE_NULL, * ep = QSE_NULL;
@ -98,7 +98,7 @@ exit_loop:
qse_mchar_t* qse_mbsxtok (
const qse_mchar_t* s, qse_size_t len,
const qse_mchar_t* delim, qse_mxstr_t* tok)
const qse_mchar_t* delim, qse_mcstr_t* tok)
{
const qse_mchar_t* p = s, *d;
const qse_mchar_t* end = s + len;
@ -178,7 +178,7 @@ exit_loop:
qse_mchar_t* qse_mbsxntok (
const qse_mchar_t* s, qse_size_t len,
const qse_mchar_t* delim, qse_size_t delim_len, qse_mxstr_t* tok)
const qse_mchar_t* delim, qse_size_t delim_len, qse_mcstr_t* tok)
{
const qse_mchar_t* p = s, *d;
const qse_mchar_t* end = s + len;
@ -259,7 +259,7 @@ exit_loop:
qse_wchar_t* qse_wcstok (
const qse_wchar_t* s, const qse_wchar_t* delim, qse_wxstr_t* tok)
const qse_wchar_t* s, const qse_wchar_t* delim, qse_wcstr_t* tok)
{
const qse_wchar_t* p = s, *d;
const qse_wchar_t* sp = QSE_NULL, * ep = QSE_NULL;
@ -335,7 +335,7 @@ exit_loop:
qse_wchar_t* qse_wcsxtok (
const qse_wchar_t* s, qse_size_t len,
const qse_wchar_t* delim, qse_wxstr_t* tok)
const qse_wchar_t* delim, qse_wcstr_t* tok)
{
const qse_wchar_t* p = s, *d;
const qse_wchar_t* end = s + len;
@ -415,7 +415,7 @@ exit_loop:
qse_wchar_t* qse_wcsxntok (
const qse_wchar_t* s, qse_size_t len,
const qse_wchar_t* delim, qse_size_t delim_len, qse_wxstr_t* tok)
const qse_wchar_t* delim, qse_size_t delim_len, qse_wcstr_t* tok)
{
const qse_wchar_t* p = s, *d;
const qse_wchar_t* end = s + len;