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

cleaned up the code a little

Browse Source
This commit is contained in:
hyung-hwan
2009-01-18 01:48:21 +00:00
parent 81cf4a462b
commit 524f2e34c9
15 changed files with 62 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/lib/awk/StdAwk.cpp
View File

@ -379,12 +379,12 @@ int StdAwk::closeFile (File& io)
StdAwk::ssize_t StdAwk::readFile (File& io, char_t* buf, size_t len)
{
return qse_sio_getsx ((qse_sio_t*)io.getHandle(), buf, len);
return qse_sio_read ((qse_sio_t*)io.getHandle(), buf, len);
}
StdAwk::ssize_t StdAwk::writeFile (File& io, const char_t* buf, size_t len)
{
return qse_sio_putsx ((qse_sio_t*)io.getHandle(), buf, len);
return qse_sio_write ((qse_sio_t*)io.getHandle(), buf, len);
}
int StdAwk::flushFile (File& io)

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

@ -283,7 +283,6 @@ int qse_awk_clear (qse_awk_t* awk)
if (awk->tree.begin != QSE_NULL)
{
qse_awk_nde_t* next = awk->tree.begin->next;
/*QSE_ASSERT (awk->tree.begin->next == QSE_NULL);*/
qse_awk_clrpt (awk, awk->tree.begin);
awk->tree.begin = QSE_NULL;
@ -426,12 +425,8 @@ int qse_awk_setword (qse_awk_t* awk,
const qse_char_t* okw, qse_size_t olen,
const qse_char_t* nkw, qse_size_t nlen)
{
qse_cstr_t* vn, * vo;
if (nkw == QSE_NULL || nlen == 0)
{
qse_map_pair_t* p;
if (okw == QSE_NULL || olen == 0)
{
/* clear the entire table */

13
qse/lib/awk/std.c
View File

@ -124,7 +124,6 @@ struct sf_t
static qse_ssize_t sf_in (int cmd, void* arg, qse_char_t* data, qse_size_t size)
{
sf_t* sf = (sf_t*)arg;
qse_cint_t c;
if (cmd == QSE_AWK_IO_OPEN)
{
@ -177,7 +176,7 @@ static qse_ssize_t sf_in (int cmd, void* arg, qse_char_t* data, qse_size_t size)
retry:
sio = sf->in.handle;
n = qse_sio_getsx (sio, data, size);
n = qse_sio_read (sio, data, size);
if (n == 0 && sf->in.p.files[++sf->in.index] != QSE_NULL)
{
if (sio != qse_sio_in) qse_sio_close (sio);
@ -279,7 +278,7 @@ static qse_ssize_t sf_out (int cmd, void* arg, qse_char_t* data, qse_size_t size
}
*/
return qse_sio_putsx (sf->out.handle, data, size);
return qse_sio_write (sf->out.handle, data, size);
}
return -1;
@ -485,7 +484,7 @@ static qse_ssize_t awk_extio_file (
case QSE_AWK_IO_READ:
{
return qse_sio_getsx (
return qse_sio_read (
(qse_sio_t*)epa->handle,
data,
size
@ -494,7 +493,7 @@ static qse_ssize_t awk_extio_file (
case QSE_AWK_IO_WRITE:
{
return qse_sio_putsx (
return qse_sio_write (
(qse_sio_t*)epa->handle,
data,
size
@ -618,7 +617,7 @@ static qse_ssize_t awk_extio_console (
{
qse_ssize_t n;
while ((n = qse_sio_getsx((qse_sio_t*)epa->handle,data,size)) == 0)
while ((n = qse_sio_read((qse_sio_t*)epa->handle,data,size)) == 0)
{
/* it has reached the end of the current file.
* open the next file if available */
@ -697,7 +696,7 @@ static qse_ssize_t awk_extio_console (
}
else if (cmd == QSE_AWK_IO_WRITE)
{
return qse_sio_putsx (
return qse_sio_write (
(qse_sio_t*)epa->handle,
data,
size

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

@ -128,7 +128,7 @@ qse_awk_val_t* qse_awk_makeintval (qse_awk_run_t* run, qse_long_t v)
if (run->vmgr.ifree == QSE_NULL)
{
qse_awk_val_ichunk_t* c;
qse_awk_val_int_t* x;
/*qse_awk_val_int_t* x;*/
qse_size_t i;
/* use qse_awk_val_ichunk structure to avoid
@ -203,7 +203,7 @@ qse_awk_val_t* qse_awk_makerealval (qse_awk_run_t* run, qse_real_t v)
if (run->vmgr.rfree == QSE_NULL)
{
qse_awk_val_rchunk_t* c;
qse_awk_val_real_t* x;
/*qse_awk_val_real_t* x;*/
qse_size_t i;
/* c = QSE_AWK_ALLOC (run->awk,
@ -289,8 +289,9 @@ qse_awk_val_t* qse_awk_makestrval (
qse_awk_setrunerrnum (run, QSE_AWK_ENOMEM);
return QSE_NULL;
}
/*
init:
*/
val->type = QSE_AWK_VAL_STR;
val->ref = 0;
val->len = len;
@ -361,7 +362,9 @@ qse_awk_val_t* qse_awk_makestrval2 (
return QSE_NULL;
}
/*
init:
*/
val->type = QSE_AWK_VAL_STR;
val->ref = 0;
val->len = len1 + len2;