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

updated qse_cut_clear()

Browse Source
This commit is contained in:
hyung-hwan
2009-10-09 07:09:19 +00:00
parent 9f494ba184
commit 98eec6a35d
6 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* $Id: str_dyn.c 295 2009-10-06 13:47:16Z hyunghwan.chung $
* $Id: str_dyn.c 297 2009-10-08 13:09:19Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@ -127,6 +127,8 @@ qse_size_t qse_str_setcapa (qse_str_t* str, qse_size_t capa)
{
qse_char_t* tmp;
if (capa == str->capa) return capa;
if (str->mmgr->realloc != QSE_NULL && str->ptr != QSE_NULL)
{
tmp = (qse_char_t*) QSE_MMGR_REALLOC (

8
qse/lib/cmn/str_utl.c
View File

@ -1,5 +1,5 @@
/*
* $Id: str_utl.c 295 2009-10-06 13:47:16Z hyunghwan.chung $
* $Id: str_utl.c 297 2009-10-08 13:09:19Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@ -312,7 +312,7 @@ int qse_strspl (
return qse_strspltrn (s, delim, lquote, rquote, escape, QSE_NULL);
}
qse_char_t* qse_strtrmc (qse_char_t* str, int opt)
qse_char_t* qse_strtrmx (qse_char_t* str, int opt)
{
qse_char_t* p = str;
qse_char_t* s = QSE_NULL, * e = QSE_NULL;
@ -327,8 +327,8 @@ qse_char_t* qse_strtrmc (qse_char_t* str, int opt)
p++;
}
if (opt & QSE_STRTRMC_RIGHT) e[1] = QSE_T('\0');
if (opt & QSE_STRTRMC_LEFT) str = s;
if (opt & QSE_STRTRMX_RIGHT) e[1] = QSE_T('\0');
if (opt & QSE_STRTRMX_LEFT) str = s;
return str;
}

21
qse/lib/cut/cut.c
View File

@ -28,7 +28,9 @@ static qse_cut_t* qse_cut_init (qse_cut_t* cut, qse_mmgr_t* mmgr);
static void qse_cut_fini (qse_cut_t* cut);
#define SETERR0(cut,num) \
do { qse_cut_seterror (cut, num, QSE_NULL); } while (0)
do { qse_cut_seterror (cut, num, QSE_NULL); } while (0)
#define DFL_LINE_CAPA 256
static int add_selector_block (qse_cut_t* cut)
{
@ -120,6 +122,13 @@ static qse_cut_t* qse_cut_init (qse_cut_t* cut, qse_mmgr_t* mmgr)
cut->e.in.cflds = QSE_COUNTOF(cut->e.in.sflds);
cut->e.in.flds = cut->e.in.sflds;
if (qse_str_init (
&cut->e.in.line, QSE_MMGR(cut), DFL_LINE_CAPA) == QSE_NULL)
{
SETERR0 (cut, QSE_CUT_ENOMEM);
return QSE_NULL;
}
return cut;
}
@ -128,6 +137,7 @@ static void qse_cut_fini (qse_cut_t* cut)
free_all_selector_blocks (cut);
if (cut->e.in.flds != cut->e.in.sflds)
QSE_MMGR_FREE (cut->mmgr, cut->e.in.flds);
qse_str_fini (&cut->e.in.line);
}
void qse_cut_setoption (qse_cut_t* cut, int option)
@ -147,6 +157,9 @@ void qse_cut_clear (qse_cut_t* cut)
QSE_MMGR_FREE (cut->mmgr, cut->e.in.flds);
cut->e.in.cflds = QSE_COUNTOF(cut->e.in.sflds);
cut->e.in.flds = cut->e.in.sflds;
qse_str_clear (&cut->e.in.line);
qse_str_setcapa (&cut->e.in.line, DFL_LINE_CAPA);
}
int qse_cut_comp (
@ -589,11 +602,6 @@ int qse_cut_exec (qse_cut_t* cut, qse_cut_io_fun_t inf, qse_cut_io_fun_t outf)
cut->e.in.len = 0;
cut->e.in.pos = 0;
cut->e.in.num = 0;
if (qse_str_init (&cut->e.in.line, QSE_MMGR(cut), 256) == QSE_NULL)
{
SETERR0 (cut, QSE_CUT_ENOMEM);
return -1;
}
cut->errnum = QSE_CUT_ENOERR;
n = cut->e.in.fun (cut, QSE_CUT_IO_OPEN, &cut->e.in.arg, QSE_NULL, 0);
@ -727,6 +735,5 @@ done:
done2:
cut->e.in.fun (cut, QSE_CUT_IO_CLOSE, &cut->e.in.arg, QSE_NULL, 0);
done3:
qse_str_fini (&cut->e.in.line);
return ret;
}