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/include/qse/Types.hpp
View File

@ -71,7 +71,7 @@ public:
typedef qse_flt_t flt_t;
/** redefines a structure of a character pointer and length */
typedef qse_xstr_t xstr_t;
typedef qse_cstr_t cstr_t;
};
/////////////////////////////////

14
qse/include/qse/awk/Awk.hpp
View File

@ -146,7 +146,7 @@ public:
///
void setError (
errnum_t code, ///< error code
const xstr_t* args = QSE_NULL, ///< message formatting
const cstr_t* args = QSE_NULL, ///< message formatting
/// argument array
const loc_t* loc = QSE_NULL ///< error location
);
@ -525,7 +525,7 @@ public:
///
/// The Index class encapsulates an index of an arrayed value.
///
class QSE_EXPORT Index: protected qse_xstr_t
class QSE_EXPORT Index: protected qse_cstr_t
{
public:
friend class Value;
@ -544,13 +544,13 @@ public:
this->len = len;
}
void set (const qse_xstr_t* x)
void set (const qse_cstr_t* x)
{
this->ptr = x->ptr;
this->len = x->len;
}
Index& operator= (const qse_xstr_t* x)
Index& operator= (const qse_cstr_t* x)
{
this->set (x);
return *this;
@ -821,7 +821,7 @@ public:
mutable struct
{
qse_xstr_t str;
qse_cstr_t str;
} cached;
public:
@ -858,7 +858,7 @@ public:
void setError (
errnum_t code,
const xstr_t* args = QSE_NULL,
const cstr_t* args = QSE_NULL,
const loc_t* loc = QSE_NULL
);
@ -1335,7 +1335,7 @@ protected:
int add (awk_t* awk, const char_t* arg, size_t len);
void clear (awk_t* awk);
qse_xstr_t* ptr;
qse_cstr_t* ptr;
size_t len;
size_t capa;
};

2
qse/include/qse/awk/StdAwk.hpp
View File

@ -59,7 +59,7 @@ public:
protected:
const char_t* name;
qse_xstr_t dir;
qse_cstr_t dir;
qse_cmgr_t* cmgr;
};

42
qse/include/qse/awk/awk.h
View File

@ -193,7 +193,7 @@ typedef struct qse_awk_val_flt_t qse_awk_val_flt_t;
struct qse_awk_val_str_t
{
QSE_AWK_VAL_HDR;
qse_xstr_t val;
qse_cstr_t val;
};
typedef struct qse_awk_val_str_t qse_awk_val_str_t;
@ -204,7 +204,7 @@ typedef struct qse_awk_val_str_t qse_awk_val_str_t;
struct qse_awk_val_rex_t
{
QSE_AWK_VAL_HDR;
qse_xstr_t str;
qse_cstr_t str;
void* code[2];
};
typedef struct qse_awk_val_rex_t qse_awk_val_rex_t;
@ -271,7 +271,7 @@ typedef struct qse_awk_val_map_itr_t qse_awk_val_map_itr_t;
* of a map value.
*/
#define QSE_AWK_VAL_MAP_ITR_KEY(itr) \
((const qse_xstr_t*)QSE_HTB_KPTL((itr)->pair))
((const qse_cstr_t*)QSE_HTB_KPTL((itr)->pair))
/**
* The #QSE_AWK_VAL_MAP_ITR_VAL macro get the pointer to the value part
@ -308,7 +308,7 @@ typedef enum qse_awk_val_map_data_type_t qse_awk_val_map_data_type_t;
*/
struct qse_awk_val_map_data_t
{
qse_xstr_t key;
qse_cstr_t key;
qse_awk_val_map_data_type_t type;
void* vptr;
};
@ -403,7 +403,7 @@ struct qse_awk_nde_t
*/
struct qse_awk_fun_t
{
qse_xstr_t name;
qse_cstr_t name;
qse_size_t nargs;
qse_awk_nde_t* body;
};
@ -810,7 +810,7 @@ typedef struct qse_awk_mod_sym_t qse_awk_mod_sym_t;
struct qse_awk_fnc_info_t
{
qse_xstr_t name;
qse_cstr_t name;
/** #QSE_NULL if the function is not registered from module */
qse_awk_mod_t* mod;
@ -1411,9 +1411,9 @@ struct qse_awk_rtx_valtostr_out_t
union
{
qse_xstr_t cpl;
qse_xstr_t cplcpy;
qse_xstr_t cpldup; /* need to free cpldup.ptr */
qse_cstr_t cpl;
qse_cstr_t cplcpy;
qse_cstr_t cpldup; /* need to free cpldup.ptr */
qse_str_t* strp;
qse_str_t* strpcat;
} u;
@ -1600,7 +1600,7 @@ QSE_EXPORT void qse_awk_geterrinf (
QSE_EXPORT void qse_awk_seterrnum (
qse_awk_t* awk, /**< awk */
qse_awk_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg /**< argument array for formatting
const qse_cstr_t* errarg /**< argument array for formatting
* an error message */
);
@ -1630,7 +1630,7 @@ QSE_EXPORT void qse_awk_geterror (
QSE_EXPORT void qse_awk_seterror (
qse_awk_t* awk, /**< awk */
qse_awk_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg, /**< argument array for formatting
const qse_cstr_t* errarg, /**< argument array for formatting
* an error message */
const qse_awk_loc_t* errloc /**< error location */
);
@ -1851,7 +1851,7 @@ QSE_EXPORT qse_char_t* qse_awk_strxdup (
*/
QSE_EXPORT qse_char_t* qse_awk_cstrdup (
qse_awk_t* awk, /**< awk */
const qse_xstr_t* str /**< string */
const qse_cstr_t* str /**< string */
);
/**
@ -2078,7 +2078,7 @@ QSE_EXPORT qse_awk_val_t* qse_awk_rtx_getarg (
* pointer to the internal value of SUBSEP. It's a specialized
* version of qse_awk_rtx_getgbl (rtx, QSE_AWK_GBL_SUBSEP).
*/
QSE_EXPORT const qse_xstr_t* qse_awk_rtx_getsubsep (
QSE_EXPORT const qse_cstr_t* qse_awk_rtx_getsubsep (
qse_awk_rtx_t* rtx /**< runtime context */
);
@ -2223,7 +2223,7 @@ QSE_EXPORT void qse_awk_rtx_geterror (
QSE_EXPORT void qse_awk_rtx_seterrnum (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg /**< arguments to format error message */
const qse_cstr_t* errarg /**< arguments to format error message */
);
/**
@ -2240,7 +2240,7 @@ QSE_EXPORT void qse_awk_rtx_seterrinf (
QSE_EXPORT void qse_awk_rtx_seterror (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg, /**< argument array for formatting
const qse_cstr_t* errarg, /**< argument array for formatting
* an error message */
const qse_awk_loc_t* errloc /**< error line */
);
@ -2261,7 +2261,7 @@ QSE_EXPORT int qse_awk_rtx_clrrec (
QSE_EXPORT int qse_awk_rtx_setrec (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_size_t idx, /**< 0 for $0, N for $N */
const qse_xstr_t* str /**< string */
const qse_cstr_t* str /**< string */
);
/**
@ -2336,17 +2336,17 @@ QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makestrvalwithwcs (
*/
QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makestrvalwithxstr (
qse_awk_rtx_t* rtx,
const qse_xstr_t* str
const qse_cstr_t* str
);
QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makestrvalwithmxstr (
qse_awk_rtx_t* rtx,
const qse_mxstr_t* mxstr
const qse_mcstr_t* mxstr
);
QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makestrvalwithwxstr (
qse_awk_rtx_t* rtx,
const qse_wxstr_t* wxstr
const qse_wcstr_t* wxstr
);
/**
@ -2392,7 +2392,7 @@ QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makenstrvalwithstr (
*/
QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makenstrvalwithxstr (
qse_awk_rtx_t* rtx,
const qse_xstr_t* str
const qse_cstr_t* str
);
/**
@ -2401,7 +2401,7 @@ QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makenstrvalwithxstr (
*/
QSE_EXPORT qse_awk_val_t* qse_awk_rtx_makerexval (
qse_awk_rtx_t* rtx,
const qse_xstr_t* str,
const qse_cstr_t* str,
void* code[2]
);

2
qse/include/qse/awk/stdawk.h
View File

@ -79,7 +79,7 @@ struct qse_awk_parsestd_t
* ptr field with qse_awk_freemem() once you're done with it to
* avoid memory leaks.
*/
qse_xstr_t str;
qse_cstr_t str;
} u;
};

2
qse/include/qse/cmn/glob.h
View File

@ -30,7 +30,7 @@
*/
typedef int (*qse_glob_cbimpl_t) (
const qse_xstr_t* path,
const qse_cstr_t* path,
void* cbctx
);

4
qse/include/qse/cmn/htb.h
View File

@ -488,7 +488,7 @@ QSE_EXPORT qse_htb_pair_t* qse_htb_update (
* qse_htb_t* htb, qse_htb_pair_t* pair,
* void* kptr, qse_size_t klen, void* ctx)
* {
* qse_xstr_t* v = (qse_xstr_t*)ctx;
* qse_cstr_t* v = (qse_cstr_t*)ctx;
* if (pair == QSE_NULL)
* {
* // no existing key for the key
@ -540,7 +540,7 @@ QSE_EXPORT qse_htb_pair_t* qse_htb_update (
*
* for (i = 0; i < QSE_COUNTOF(vals); i++)
* {
* qse_xstr_t ctx;
* qse_cstr_t ctx;
* ctx.ptr = vals[i]; ctx.len = qse_strlen(vals[i]);
* qse_htb_cbsert (s1,
* keys[i%QSE_COUNTOF(keys)], qse_strlen(keys[i%QSE_COUNTOF(keys)]),

4
qse/include/qse/cmn/mbwc.h
View File

@ -240,7 +240,7 @@ QSE_EXPORT qse_mchar_t* qse_wcsatombsdupwithcmgr (
QSE_EXPORT qse_mchar_t* qse_wcsnatombsdupwithcmgr (
const qse_wxstr_t wcs[],
const qse_wcstr_t wcs[],
qse_size_t* mbslen,
qse_mmgr_t* mmgr,
qse_cmgr_t* cmgr
@ -454,7 +454,7 @@ QSE_EXPORT qse_mchar_t* qse_wcsatombsdup (
);
QSE_EXPORT qse_mchar_t* qse_wcsnatombsdup (
const qse_wxstr_t wcs[],
const qse_wcstr_t wcs[],
qse_size_t* mbslen,
qse_mmgr_t* mmgr
);

4
qse/include/qse/cmn/rbt.h
View File

@ -438,7 +438,7 @@ QSE_EXPORT qse_rbt_pair_t* qse_rbt_update (
* qse_rbt_t* rbt, qse_rbt_pair_t* pair,
* void* kptr, qse_size_t klen, void* ctx)
* {
* qse_xstr_t* v = (qse_xstr_t*)ctx;
* qse_cstr_t* v = (qse_cstr_t*)ctx;
* if (pair == QSE_NULL)
* {
* // no existing key for the key
@ -490,7 +490,7 @@ QSE_EXPORT qse_rbt_pair_t* qse_rbt_update (
*
* for (i = 0; i < QSE_COUNTOF(vals); i++)
* {
* qse_xstr_t ctx;
* qse_cstr_t ctx;
* ctx.ptr = vals[i]; ctx.len = qse_strlen(vals[i]);
* qse_rbt_cbsert (s1,
* keys[i%QSE_COUNTOF(keys)], qse_strlen(keys[i%QSE_COUNTOF(keys)]),

12
qse/include/qse/cmn/rex.h
View File

@ -276,9 +276,9 @@ QSE_EXPORT qse_rex_node_t* qse_rex_comp (
QSE_EXPORT int qse_rex_exec (
qse_rex_t* rex,
const qse_xstr_t* str,
const qse_xstr_t* substr,
qse_xstr_t* matstr
const qse_cstr_t* str,
const qse_cstr_t* substr,
qse_cstr_t* matstr
);
@ -296,9 +296,9 @@ QSE_EXPORT int qse_matchrex (
qse_size_t depth,
void* code,
int option,
const qse_xstr_t* str,
const qse_xstr_t* substr,
qse_xstr_t* match,
const qse_cstr_t* str,
const qse_cstr_t* substr,
qse_cstr_t* match,
qse_rex_errnum_t* errnum
);

70
qse/include/qse/cmn/str.h
View File

@ -28,7 +28,7 @@
/** \file
* This file provides various functions, types, macros for string manipulation.
*
* The #qse_xstr_t type and the #qse_xstr_t defined in <qse/types.h> help you
* The #qse_cstr_t type and the #qse_cstr_t defined in <qse/types.h> help you
* deal with a string pointer and length in a structure.
*/
@ -76,7 +76,7 @@ typedef qse_size_t (*qse_wcs_sizer_t) (
);
#if defined(QSE_CHAR_IS_MCHAR)
# define QSE_STR_XSTR(s) ((qse_xstr_t*)QSE_MBS_XSTR(s))
# define QSE_STR_XSTR(s) ((qse_cstr_t*)QSE_MBS_XSTR(s))
# define QSE_STR_LEN(s) QSE_MBS_LEN(s)
# define QSE_STR_PTR(s) QSE_MBS_PTR(s)
# define QSE_STR_CPTR(s,idx) QSE_MBS_CPTR(s,idx)
@ -86,7 +86,7 @@ typedef qse_size_t (*qse_wcs_sizer_t) (
# define qse_str_t qse_mbs_t
# define qse_str_sizer_t qse_mbs_sizer_t
#else
# define QSE_STR_XSTR(s) ((qse_xstr_t*)QSE_WCS_XSTR(s))
# define QSE_STR_XSTR(s) ((qse_cstr_t*)QSE_WCS_XSTR(s))
# define QSE_STR_LEN(s) QSE_WCS_LEN(s)
# define QSE_STR_PTR(s) QSE_WCS_PTR(s)
# define QSE_STR_CPTR(s,idx) QSE_WCS_CPTR(s,idx)
@ -105,7 +105,7 @@ struct qse_mbs_t
{
qse_mmgr_t* mmgr;
qse_mbs_sizer_t sizer; /**< buffer resizer function */
qse_mxstr_t val; /**< buffer/string pointer and lengh */
qse_mcstr_t val; /**< buffer/string pointer and lengh */
qse_size_t capa; /**< buffer capacity */
};
@ -116,7 +116,7 @@ struct qse_wcs_t
{
qse_mmgr_t* mmgr;
qse_wcs_sizer_t sizer; /**< buffer resizer function */
qse_wxstr_t val; /**< buffer/string pointer and lengh */
qse_wcstr_t val; /**< buffer/string pointer and lengh */
qse_size_t capa; /**< buffer capacity */
};
@ -131,7 +131,7 @@ struct qse_wcs_t
typedef qse_mchar_t* (*qse_mbssubst_t) (
qse_mchar_t* buf,
qse_size_t bsz,
const qse_mxstr_t* ident,
const qse_mcstr_t* ident,
void* ctx
);
@ -142,7 +142,7 @@ typedef qse_mchar_t* (*qse_mbssubst_t) (
typedef qse_wchar_t* (*qse_wcssubst_t) (
qse_wchar_t* buf,
qse_size_t bsz,
const qse_wxstr_t* ident,
const qse_wcstr_t* ident,
void* ctx
);
@ -585,25 +585,25 @@ QSE_EXPORT qse_size_t qse_wcsfcpy (
/**
* The qse_mbsfncpy() function formats a string by position.
* It differs from qse_mbsfcpy() in that \a str is an array of the
* #qse_mxstr_t type.
* #qse_mcstr_t type.
* \sa qse_mbsfcpy, qse_mbsxfcpy, qse_mbsxfncpy
*/
QSE_EXPORT qse_size_t qse_mbsfncpy (
qse_mchar_t* buf,
const qse_mchar_t* fmt,
const qse_mxstr_t str[]
const qse_mcstr_t str[]
);
/**
* The qse_wcsfncpy() function formats a string by position.
* It differs from qse_wcsfcpy() in that \a str is an array of the
* #qse_wxstr_t type.
* #qse_wcstr_t type.
* \sa qse_wcsfcpy, qse_wcsxfcpy, qse_wcsxfncpy
*/
QSE_EXPORT qse_size_t qse_wcsfncpy (
qse_wchar_t* buf,
const qse_wchar_t* fmt,
const qse_wxstr_t str[]
const qse_wcstr_t str[]
);
/**
@ -645,27 +645,27 @@ QSE_EXPORT qse_size_t qse_wcsxfcpy (
/**
* The qse_mbsxfncpy() function formats a string by position.
* It differs from qse_strfcpy() in that \a buf is length-bounded of \a bsz
* characters and \a str is an array of the #qse_mxstr_t type.
* characters and \a str is an array of the #qse_mcstr_t type.
* \sa qse_mbsfcpy, qse_mbsfncpy, qse_mbsxfcpy
*/
QSE_EXPORT qse_size_t qse_mbsxfncpy (
qse_mchar_t* buf,
qse_size_t bsz,
const qse_mchar_t* fmt,
const qse_mxstr_t str[]
const qse_mcstr_t str[]
);
/**
* The qse_wcsxfncpy() function formats a string by position.
* It differs from qse_strfcpy() in that \a buf is length-bounded of \a bsz
* characters and \a str is an array of the #qse_wxstr_t type.
* characters and \a str is an array of the #qse_wcstr_t type.
* \sa qse_wcsfcpy, qse_wcsfncpy, qse_wcsxfcpy
*/
QSE_EXPORT qse_size_t qse_wcsxfncpy (
qse_wchar_t* buf,
qse_size_t bsz,
const qse_wchar_t* fmt,
const qse_wxstr_t str[]
const qse_wcstr_t str[]
);
#if defined(QSE_CHAR_IS_MCHAR)
@ -781,7 +781,7 @@ QSE_EXPORT qse_size_t qse_wcsxvfmt (
* \a bsz by substituting new values for ${} segments within it. The actual
* substitution is made by invoking the callback function \a subst.
* \code
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mxstr_t* ident, void* ctx)
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mcstr_t* ident, void* ctx)
* {
* if (qse_mbsxcmp (ident->ptr, ident->len, QSE_MT("USER")) == 0)
* return buf + qse_mbsxput (buf, bsz, QSE_MT("sam"));
@ -803,7 +803,7 @@ QSE_EXPORT qse_size_t qse_wcsxvfmt (
* if the buffer points to #QSE_MBSSUBST_NOBUF as shown belown.
*
* \code
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mxstr_t* ident, void* ctx)
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mcstr_t* ident, void* ctx)
* {
* if (qse_mcsxcmp (ident->ptr, ident->len, QSE_MT("USER")) == 0)
* return buf + (buf == QSE_MBSSUBST_NOBUF? 3: qse_mcsxput (buf, bsz, QSE_MT("sam")));
@ -823,7 +823,7 @@ QSE_EXPORT qse_size_t qse_wcsxvfmt (
* recursively.
*
* \code
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mxstr_t* ident, void* ctx)
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_mcstr_t* ident, void* ctx)
* {
* if (qse_mbsxcmp (ident->ptr, ident->len, QSE_MT("USER")) == 0)
* return QSE_NULL;
@ -855,7 +855,7 @@ QSE_EXPORT qse_size_t qse_mbsxnsubst (
* \a bsz by substituting new values for ${} segments within it. The actual
* substitution is made by invoking the callback function \a subst.
* \code
* qse_wchar_t* subst (qse_wchar_t* buf, qse_size_t bsz, const qse_wxstr_t* ident, void* ctx)
* qse_wchar_t* subst (qse_wchar_t* buf, qse_size_t bsz, const qse_wcstr_t* ident, void* ctx)
* {
* if (qse_wcsxcmp (ident->ptr, ident->len, QSE_WT("USER")) == 0)
* return buf + qse_wcsxput (buf, bsz, QSE_WT("sam"));
@ -876,7 +876,7 @@ QSE_EXPORT qse_size_t qse_mbsxnsubst (
* above can be extended to return the buffer pointer without actual copying
*
* \code
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_wxstr_t* ident, void* ctx)
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_wcstr_t* ident, void* ctx)
* {
* if (qse_wcsxcmp (ident->ptr, ident->len, QSE_WT("USER")) == 0)
* return buf + (buf == QSE_WCSSUBST_NOBUF? 3: qse_wcsxput (buf, bsz, QSE_WT("sam")));
@ -896,7 +896,7 @@ QSE_EXPORT qse_size_t qse_mbsxnsubst (
* recursively.
*
* \code
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_wxstr_t* ident, void* ctx)
* qse_mchar_t* subst (qse_mchar_t* buf, qse_size_t bsz, const qse_wcstr_t* ident, void* ctx)
* {
* if (qse_wcsxcmp (ident->ptr, ident->len, QSE_WT("USER")) == 0)
* return QSE_NULL;
@ -1288,23 +1288,23 @@ QSE_EXPORT qse_wchar_t* qse_wcsadup (
#endif
QSE_EXPORT qse_mchar_t* qse_mcstrdup (
const qse_mxstr_t* str,
const qse_mcstr_t* str,
qse_mmgr_t* mmgr
);
QSE_EXPORT qse_mchar_t* qse_mcstradup (
const qse_mxstr_t str[],
const qse_mcstr_t str[],
qse_size_t* len,
qse_mmgr_t* mmgr
);
QSE_EXPORT qse_wchar_t* qse_wcstrdup (
const qse_wxstr_t* str,
const qse_wcstr_t* str,
qse_mmgr_t* mmgr
);
QSE_EXPORT qse_wchar_t* qse_wcstradup (
const qse_wxstr_t str[],
const qse_wcstr_t str[],
qse_size_t* len,
qse_mmgr_t* mmgr
);
@ -2284,14 +2284,14 @@ QSE_EXPORT int qse_wcsspltrn (
QSE_EXPORT qse_mchar_t* qse_mbstok (
const qse_mchar_t* s,
const qse_mchar_t* delim,
qse_mxstr_t* tok
qse_mcstr_t* tok
);
QSE_EXPORT qse_mchar_t* qse_mbsxtok (
const qse_mchar_t* s,
qse_size_t len,
const qse_mchar_t* delim,
qse_mxstr_t* tok
qse_mcstr_t* tok
);
QSE_EXPORT qse_mchar_t* qse_mbsxntok (
@ -2299,20 +2299,20 @@ QSE_EXPORT qse_mchar_t* qse_mbsxntok (
qse_size_t len,
const qse_mchar_t* delim,
qse_size_t delim_len,
qse_mxstr_t* tok
qse_mcstr_t* tok
);
QSE_EXPORT qse_wchar_t* qse_wcstok (
const qse_wchar_t* s,
const qse_wchar_t* delim,
qse_wxstr_t* tok
qse_wcstr_t* tok
);
QSE_EXPORT qse_wchar_t* qse_wcsxtok (
const qse_wchar_t* s,
qse_size_t len,
const qse_wchar_t* delim,
qse_wxstr_t* tok
qse_wcstr_t* tok
);
QSE_EXPORT qse_wchar_t* qse_wcsxntok (
@ -2320,7 +2320,7 @@ QSE_EXPORT qse_wchar_t* qse_wcsxntok (
qse_size_t len,
const qse_wchar_t* delim,
qse_size_t delim_len,
qse_wxstr_t* tok
qse_wcstr_t* tok
);
#if defined(QSE_CHAR_IS_MCHAR)
@ -2613,13 +2613,13 @@ QSE_EXPORT void* qse_mbs_getxtn (
/**
* The qse_mbs_yield() function assigns the buffer to an variable of the
* #qse_mxstr_t type and recreate a new buffer of the \a new_capa capacity.
* #qse_mcstr_t type and recreate a new buffer of the \a new_capa capacity.
* The function fails if it fails to allocate a new buffer.
* \return 0 on success, and -1 on failure.
*/
QSE_EXPORT int qse_mbs_yield (
qse_mbs_t* str, /**< string */
qse_mxstr_t* buf, /**< buffer pointer */
qse_mcstr_t* buf, /**< buffer pointer */
qse_size_t newcapa /**< new capacity */
);
@ -2810,13 +2810,13 @@ QSE_EXPORT void* qse_wcs_getxtn (
/**
* The qse_wcs_yield() function assigns the buffer to an variable of the
* #qse_wxstr_t type and recreate a new buffer of the \a new_capa capacity.
* #qse_wcstr_t type and recreate a new buffer of the \a new_capa capacity.
* The function fails if it fails to allocate a new buffer.
* \return 0 on success, and -1 on failure.
*/
QSE_EXPORT int qse_wcs_yield (
qse_wcs_t* str, /**< string */
qse_wxstr_t* buf, /**< buffer pointer */
qse_wcstr_t* buf, /**< buffer pointer */
qse_size_t new_capa /**< new capacity */
);

32
qse/include/qse/cmn/uri.h
View File

@ -29,32 +29,32 @@ typedef struct qse_wuri_t qse_wuri_t;
struct qse_muri_t
{
qse_mxstr_t scheme;
qse_mcstr_t scheme;
struct
{
qse_mxstr_t user;
qse_mxstr_t pass;
qse_mcstr_t user;
qse_mcstr_t pass;
} auth;
qse_mxstr_t host;
qse_mxstr_t port;
qse_mxstr_t path;
qse_mxstr_t query;
qse_mxstr_t frag;
qse_mcstr_t host;
qse_mcstr_t port;
qse_mcstr_t path;
qse_mcstr_t query;
qse_mcstr_t frag;
};
struct qse_wuri_t
{
qse_wxstr_t scheme;
qse_wcstr_t scheme;
struct
{
qse_wxstr_t user;
qse_wxstr_t pass;
qse_wcstr_t user;
qse_wcstr_t pass;
} auth;
qse_wxstr_t host;
qse_wxstr_t port;
qse_wxstr_t path;
qse_wxstr_t query;
qse_wxstr_t frag;
qse_wcstr_t host;
qse_wcstr_t port;
qse_wcstr_t path;
qse_wcstr_t query;
qse_wcstr_t frag;
};
enum qse_mbstouri_flag_t

2
qse/include/qse/http/htrd.h
View File

@ -186,7 +186,7 @@ QSE_EXPORT int qse_htrd_halt (
QSE_EXPORT int qse_htrd_scanqparam (
qse_htrd_t* http,
const qse_mxstr_t* cstr
const qse_mcstr_t* cstr
);
#ifdef __cplusplus

4
qse/include/qse/http/htre.h
View File

@ -169,13 +169,13 @@ QSE_EXPORT void qse_htre_clear (
QSE_EXPORT int qse_htre_setstrfromcstr (
qse_htre_t* re,
qse_mbs_t* str,
const qse_mxstr_t* cstr
const qse_mcstr_t* cstr
);
QSE_EXPORT int qse_htre_setstrfromxstr (
qse_htre_t* re,
qse_mbs_t* str,
const qse_mxstr_t* xstr
const qse_mcstr_t* xstr
);
QSE_EXPORT const qse_htre_hdrval_t* qse_htre_getheaderval (

4
qse/include/qse/http/http.h
View File

@ -35,7 +35,7 @@
typedef qse_mbs_t qse_htob_t;
/* octet string */
typedef qse_mxstr_t qse_htos_t;
typedef qse_mcstr_t qse_htos_t;
/**
* The qse_http_version_t type defines http version.
@ -176,7 +176,7 @@ QSE_EXPORT qse_http_method_t qse_mbstohttpmethod (
);
QSE_EXPORT qse_http_method_t qse_mcstrtohttpmethod (
const qse_mxstr_t* name
const qse_mcstr_t* name
);
QSE_EXPORT int qse_parsehttprange (

2
qse/include/qse/http/stdhttpd.h
View File

@ -76,7 +76,7 @@ struct qse_httpd_serverstd_realm_t
typedef struct qse_httpd_serverstd_auth_t qse_httpd_serverstd_auth_t;
struct qse_httpd_serverstd_auth_t
{
qse_mxstr_t key;
qse_mcstr_t key;
int authok;
};

2
qse/include/qse/sed/Sed.hpp
View File

@ -246,7 +246,7 @@ public:
///
void setError (
errnum_t num, ///< error number
const xstr_t* args = QSE_NULL, ///< string array for formatting
const cstr_t* args = QSE_NULL, ///< string array for formatting
/// an error message
const loc_t* loc = QSE_NULL ///< error location
);

18
qse/include/qse/sed/sed.h
View File

@ -154,19 +154,19 @@ struct qse_sed_cmd_t
union
{
/* text for the a, i, c commands */
qse_xstr_t text;
qse_cstr_t text;
/* file name for r, w, R, W */
qse_xstr_t file;
qse_cstr_t file;
/* data for the s command */
struct
{
void* rex; /* regular expression */
qse_xstr_t rpl; /* replacement */
qse_cstr_t rpl; /* replacement */
/* flags */
qse_xstr_t file; /* file name for w */
qse_cstr_t file; /* file name for w */
unsigned short occ;
unsigned short g: 1; /* global */
unsigned short p: 1; /* print */
@ -175,12 +175,12 @@ struct qse_sed_cmd_t
} subst;
/* translation set for the y command */
qse_xstr_t transet;
qse_cstr_t transet;
/* branch target for b and t */
struct
{
qse_xstr_t label;
qse_cstr_t label;
qse_sed_cmd_t* target;
} branch;
@ -561,7 +561,7 @@ QSE_EXPORT void qse_sed_geterror (
QSE_EXPORT void qse_sed_seterrnum (
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg /**< argument for formatting error message */
const qse_cstr_t* errarg /**< argument for formatting error message */
);
/**
@ -583,7 +583,7 @@ QSE_EXPORT void qse_sed_seterrmsg (
QSE_EXPORT void qse_sed_seterror (
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg, /**< array of arguments for formatting
const qse_cstr_t* errarg, /**< array of arguments for formatting
* an error message */
const qse_sed_loc_t* errloc /**< error location */
);
@ -722,7 +722,7 @@ QSE_EXPORT void qse_sed_freemem (
QSE_EXPORT void qse_sed_getspace (
qse_sed_t* sed,
qse_sed_space_t space,
qse_xstr_t* str
qse_cstr_t* str
);
#ifdef __cplusplus

8
qse/include/qse/sed/stdsed.h
View File

@ -82,7 +82,7 @@ struct qse_sed_iostd_t
* the ptr field with qse_sed_freemem() once you're done with it
* to avoid memory leaks.
*/
qse_xstr_t str;
qse_cstr_t str;
/** pre-opened sio stream */
qse_sio_t* sio;
@ -176,7 +176,7 @@ QSE_EXPORT int qse_sed_compstdstr (
*/
QSE_EXPORT int qse_sed_compstdxstr (
qse_sed_t* sed,
const qse_xstr_t* script
const qse_cstr_t* script
);
/**
@ -229,8 +229,8 @@ QSE_EXPORT int qse_sed_execstdfile (
*/
QSE_EXPORT int qse_sed_execstdxstr (
qse_sed_t* sed,
const qse_xstr_t* instr,
qse_xstr_t* outstr,
const qse_cstr_t* instr,
qse_cstr_t* outstr,
qse_cmgr_t* cmgr
);

16
qse/include/qse/types.h
View File

@ -617,31 +617,31 @@ struct qse_link_t
};
/**
* The qse_mxstr_t type defines a structure combining a pointer to a character
* The qse_mcstr_t type defines a structure combining a pointer to a character
* string and the number of characters.
*/
struct qse_mxstr_t
struct qse_mcstr_t
{
qse_mchar_t* ptr; /**< pointer to a character string */
qse_size_t len; /**< the number of characters */
};
typedef struct qse_mxstr_t qse_mxstr_t;
typedef struct qse_mcstr_t qse_mcstr_t;
/**
* The qse_wxstr_t type defines a structure combining a pointer to a character
* The qse_wcstr_t type defines a structure combining a pointer to a character
* string and the number of characters.
*/
struct qse_wxstr_t
struct qse_wcstr_t
{
qse_wchar_t* ptr; /**< pointer to a character string */
qse_size_t len; /**< the number of characters */
};
typedef struct qse_wxstr_t qse_wxstr_t;
typedef struct qse_wcstr_t qse_wcstr_t;
#if defined(QSE_CHAR_IS_MCHAR)
typedef qse_mxstr_t qse_xstr_t;
typedef qse_mcstr_t qse_cstr_t;
#else
typedef qse_wxstr_t qse_xstr_t;
typedef qse_wcstr_t qse_cstr_t;
#endif
/**

2
qse/include/qse/xli/stdxli.h
View File

@ -80,7 +80,7 @@ struct qse_xli_iostd_t
* ptr field with qse_xli_freemem() once you're done with it to
* avoid memory leaks.
*/
qse_xstr_t str;
qse_cstr_t str;
} u;
};

10
qse/include/qse/xli/xli.h
View File

@ -490,7 +490,7 @@ QSE_EXPORT void qse_xli_geterror (
QSE_EXPORT void qse_xli_seterrnum (
qse_xli_t* xli, /**< stream editor */
qse_xli_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg /**< argument for formatting error message */
const qse_cstr_t* errarg /**< argument for formatting error message */
);
/**
@ -512,7 +512,7 @@ QSE_EXPORT void qse_xli_seterrmsg (
QSE_EXPORT void qse_xli_seterror (
qse_xli_t* xli, /**< stream editor */
qse_xli_errnum_t errnum, /**< error number */
const qse_xstr_t* errarg, /**< array of arguments for formatting
const qse_cstr_t* errarg, /**< array of arguments for formatting
* an error message */
const qse_xli_loc_t* errloc /**< error location */
);
@ -558,7 +558,7 @@ QSE_EXPORT qse_xli_pair_t* qse_xli_insertpairwithstr (
const qse_char_t* key,
const qse_char_t* alias,
const qse_char_t* keytag,
const qse_xstr_t* value,
const qse_cstr_t* value,
const qse_char_t* strtag
);
@ -569,7 +569,7 @@ QSE_EXPORT qse_xli_pair_t* qse_xli_insertpairwithstrs (
const qse_char_t* key,
const qse_char_t* alias,
const qse_char_t* keytag,
const qse_xstr_t value[],
const qse_cstr_t value[],
qse_size_t count
);
@ -614,7 +614,7 @@ QSE_EXPORT qse_xli_str_t* qse_xli_addsegtostr (
qse_xli_t* xli,
qse_xli_str_t* str,
const qse_char_t* tag,
const qse_xstr_t* value
const qse_cstr_t* value
);
/**