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

fixed bugs and added more features.

Browse Source 
- fixed a bug in qse_sed_exec() to return success on flush() error
- added Sed::setError()
- completed a sample program sed03.cpp
This commit is contained in:
hyung-hwan
2009-05-30 00:21:41 +00:00
parent 0e679b0b7d
commit 7053747ab2
10 changed files with 171 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qse/lib/sed/Sed.cpp
View File

@ -89,6 +89,12 @@ Sed::errnum_t Sed::getErrorNumber () const throw ()
return (sed == QSE_NULL)? QSE_SED_ENOERR: qse_sed_geterrnum (sed);
}
void Sed::setError (errnum_t err, size_t lin, const cstr_t* args)
{
QSE_ASSERT (sed != QSE_NULL);
qse_sed_seterror (sed, err, lin, args);
}
Sed::size_t Sed::getConsoleLine () throw ()
{
QSE_ASSERT (sed != QSE_NULL);

12
qse/lib/sed/sed.c
View File

@ -1391,8 +1391,9 @@ static int read_file (
n = sed->e.in.fun (sed, QSE_SED_IO_OPEN, &arg);
if (n <= -1)
{
/*SETERR0 (sed, QSE_SED_EIOUSR, cmd->lnum);
return -1;*/
/*if (sed->errnum != QSE_SED_ENOERR)
* SETERR0 (sed, QSE_SED_EIOUSR, cmd->lnum);
*return -1;*/
/* it is ok if it is not able to open a file */
return 0;
}
@ -1521,7 +1522,10 @@ static int flush (qse_sed_t* sed)
if (n == 0)
{
/* reached the end of file - anything to do? */
/* reached the end of file - this is also an error */
if (sed->errnum == QSE_SED_ENOERR)
SETERR0 (sed, QSE_SED_EIOUSR, 0);
return -1;
}
pos += n;
@ -2629,7 +2633,7 @@ int qse_sed_exec (qse_sed_t* sed, qse_sed_io_fun_t inf, qse_sed_io_fun_t outf)
/* flush the output stream in case it's not flushed
* in write functions */
n = flush (sed);
if (n <= -1) goto done;
if (n <= -1) { ret = -1; goto done; }
}
done: