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

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan
2006-12-09 11:50:08 +00:00
parent b104bc387c
commit 407867e352
19 changed files with 1310 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ase/awk/extio.c
View File

@ -1,5 +1,5 @@
/*
* $Id: extio.c,v 1.65 2006-11-29 02:54:15 bacon Exp $
* $Id: extio.c,v 1.66 2006-12-09 11:49:03 bacon Exp $
*/
#include <ase/awk/awk_i.h>
@ -143,7 +143,7 @@ int ase_awk_readextio (
p->in.eos = ase_false;
n = handler (ASE_AWK_IO_OPEN, p, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
ASE_AWK_FREE (run->awk, p->name);
ASE_AWK_FREE (run->awk, p);
@ -226,7 +226,7 @@ int ase_awk_readextio (
n = handler (ASE_AWK_IO_READ, p,
p->in.buf, ASE_COUNTOF(p->in.buf));
if (n == -1)
if (n <= -1)
{
/* handler error. getline should return -1 */
/* TODO: use meaningful error code */
@ -477,7 +477,7 @@ int ase_awk_writeextio_str (
p->out.eos = ase_false;
n = handler (ASE_AWK_IO_OPEN, p, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
ASE_AWK_FREE (run->awk, p->name);
ASE_AWK_FREE (run->awk, p);
@ -524,7 +524,7 @@ int ase_awk_writeextio_str (
{
n = handler (ASE_AWK_IO_WRITE, p, str, len);
if (n == -1)
if (n <= -1)
{
/* TODO: use meaningful error code */
if (ase_awk_setglobal (
@ -584,7 +584,7 @@ int ase_awk_flushextio (
{
n = handler (ASE_AWK_IO_FLUSH, p, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
/* TODO: use meaningful error code */
if (ase_awk_setglobal (
@ -662,7 +662,7 @@ int ase_awk_nextextio_read (
}
n = handler (ASE_AWK_IO_NEXT, p, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
/* TODO: is this errnum correct? */
run->errnum = ASE_AWK_EIOHANDLER;
@ -741,7 +741,7 @@ int ase_awk_nextextio_write (
}
n = handler (ASE_AWK_IO_NEXT, p, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
/* TODO: is this errnum correct? */
run->errnum = ASE_AWK_EIOHANDLER;
@ -802,7 +802,7 @@ int ase_awk_closeextio_read (
handler = run->extio.handler[p->type & __MASK_CLEAR];
if (handler != ASE_NULL)
{
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) == -1)
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) <= -1)
{
/* this is not a run-time error.*/
/* TODO: set ERRNO */
@ -865,7 +865,7 @@ int ase_awk_closeextio_write (
handler = run->extio.handler[p->type & __MASK_CLEAR];
if (handler != ASE_NULL)
{
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) == -1)
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) <= -1)
{
/* this is not a run-time error.*/
/* TODO: set ERRNO */
@ -907,7 +907,7 @@ int ase_awk_closeextio (ase_awk_run_t* run, const ase_char_t* name)
handler = run->extio.handler[p->type & __MASK_CLEAR];
if (handler != ASE_NULL)
{
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) == -1)
if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) <= -1)
{
/* this is not a run-time error.*/
/* TODO: set ERRNO */
@ -949,7 +949,7 @@ void ase_awk_clearextio (ase_awk_run_t* run)
if (handler != ASE_NULL)
{
n = handler (ASE_AWK_IO_CLOSE, run->extio.chain, ASE_NULL, 0);
if (n == -1)
if (n <= -1)
{
/* TODO:
* some warning actions need to be taken */

16
ase/awk/parse.c
View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c,v 1.217 2006-12-08 06:02:41 bacon Exp $
* $Id: parse.c,v 1.218 2006-12-09 11:49:03 bacon Exp $
*/
#include <ase/awk/awk_i.h>
@ -371,7 +371,7 @@ static int __parse (ase_awk_t* awk)
op = awk->src.ios.in (
ASE_AWK_IO_OPEN, awk->src.ios.custom_data, ASE_NULL, 0);
if (op == -1)
if (op <= -1)
{
/* cannot open the source file.
* it doesn't even have to call CLOSE */
@ -431,9 +431,9 @@ static int __parse (ase_awk_t* awk)
exit_parse:
if (awk->src.ios.in (
ASE_AWK_IO_CLOSE, awk->src.ios.custom_data, ASE_NULL, 0) == -1)
ASE_AWK_IO_CLOSE, awk->src.ios.custom_data, ASE_NULL, 0) != 0)
{
if (n != -1)
if (n == 0)
{
/* this is to keep the earlier error above
* that might be more critical than this */
@ -4161,7 +4161,7 @@ static int __get_char (ase_awk_t* awk)
n = awk->src.ios.in (
ASE_AWK_IO_READ, awk->src.ios.custom_data,
awk->src.shared.buf, ASE_COUNTOF(awk->src.shared.buf));
if (n == -1)
if (n <= -1)
{
awk->errnum = ASE_AWK_ESRCINREAD;
return -1;
@ -4372,7 +4372,7 @@ static int __deparse (ase_awk_t* awk)
op = awk->src.ios.out (
ASE_AWK_IO_OPEN, awk->src.ios.custom_data, ASE_NULL, 0);
if (op == -1)
if (op <= -1)
{
awk->errnum = ASE_AWK_ESRCOUTOPEN;
return -1;
@ -4509,9 +4509,9 @@ static int __deparse (ase_awk_t* awk)
exit_deparse:
if (awk->src.ios.out (
ASE_AWK_IO_CLOSE, awk->src.ios.custom_data, ASE_NULL, 0) == -1)
ASE_AWK_IO_CLOSE, awk->src.ios.custom_data, ASE_NULL, 0) != 0)
{
if (n != -1)
if (n == 0)
{
awk->errnum = ASE_AWK_ESRCOUTCLOSE;
n = -1;