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

1
qse/lib/cmn/fio.c
View File

@ -17,6 +17,7 @@
*/
#include <qse/cmn/fio.h>
#include <qse/cmn/str.h>
#include "mem.h"
#ifdef _WIN32

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

@ -441,7 +441,7 @@ qse_ssize_t qse_pcp_read (
if (pcp->pip[hid].tio == QSE_NULL)
return pcp_read (pcp, buf, size, pcp->pip[hid].handle);
else
return qse_tio_getsx (pcp->pip[hid].tio, buf, size);
return qse_tio_read (pcp->pip[hid].tio, buf, size);
}
qse_ssize_t qse_pcp_write (
@ -450,7 +450,7 @@ qse_ssize_t qse_pcp_write (
if (pcp->pip[hid].tio == QSE_NULL)
return pcp_write (pcp, data, size, pcp->pip[hid].handle);
else
return qse_tio_putsx (pcp->pip[hid].tio, data, size);
return qse_tio_write (pcp->pip[hid].tio, data, size);
}
qse_ssize_t qse_pcp_flush (qse_pcp_t* pcp, qse_pcp_hid_t hid)

13
qse/lib/cmn/sio.c
View File

@ -236,10 +236,6 @@ qse_ssize_t qse_sio_gets (qse_sio_t* sio, qse_char_t* buf, qse_size_t size)
return qse_tio_gets (&sio->tio, buf, size);
}
qse_ssize_t qse_sio_getsx (qse_sio_t* sio, qse_char_t* buf, qse_size_t size)
{
return qse_tio_getsx (&sio->tio, buf, size);
}
qse_ssize_t qse_sio_getstr (qse_sio_t* sio, qse_str_t* buf)
{
@ -256,9 +252,14 @@ qse_ssize_t qse_sio_puts (qse_sio_t* sio, const qse_char_t* str)
return qse_tio_puts (&sio->tio, str);
}
qse_ssize_t qse_sio_putsx (qse_sio_t* sio, const qse_char_t* str, qse_size_t size)
qse_ssize_t qse_sio_read (qse_sio_t* sio, qse_char_t* buf, qse_size_t size)
{
return qse_tio_putsx (&sio->tio, str, size);
return qse_tio_read (&sio->tio, buf, size);
}
qse_ssize_t qse_sio_write (qse_sio_t* sio, const qse_char_t* str, qse_size_t size)
{
return qse_tio_write (&sio->tio, str, size);
}
#if 0

2
qse/lib/cmn/sll.c
View File

@ -217,7 +217,7 @@ node_t* qse_sll_gettail (sll_t* sll)
node_t* qse_sll_search (sll_t* sll, node_t* pos, const void* dptr, size_t dlen)
{
pos = (pos == QSE_NULL)? pos = sll->head: NEXT(pos);
pos = (pos == QSE_NULL)? sll->head: NEXT(pos);
while (pos != QSE_NULL)
{

1
qse/lib/cmn/str_cnv.c
View File

@ -17,6 +17,7 @@
*/
#include <qse/cmn/str.h>
#include <qse/cmn/chr.h>
int qse_strtoi (const qse_char_t* str)
{

11
qse/lib/cmn/time.c
View File

@ -20,16 +20,13 @@
#include "mem.h"
#ifdef _WIN32
#include <windows.h>
# include <windows.h>
#else
#include <sys/time.h>
# include "syscall.h"
# include <sys/time.h>
#endif
#include <time.h>
#if defined(QSE_USE_SYSCALL) && defined(HAVE_SYS_SYSCALL_H)
#include <sys/syscall.h>
#endif
#ifdef _WIN32
#define WIN_EPOCH_YEAR (1601)
#define WIN_EPOCH_MON (1)
@ -265,6 +262,7 @@ int qse_timegm (const qse_btime_t* bt, qse_ntime_t* nt)
#ifdef HAVE_TIMEGM
*nt = ((qse_ntime_t)timegm(&tm)*QSE_MSECS_PER_SEC) + bt->msec;
return 0;
#else
#warning #### timegm() is not available on this platform ####
return -1;
@ -290,6 +288,7 @@ int qse_timelocal (const qse_btime_t* bt, qse_ntime_t* nt)
#ifdef HAVE_TIMELOCAL
*nt = ((qse_ntime_t)timelocal(&tm)*QSE_MSECS_PER_SEC) + bt->msec;
return 0;
#else
#warning #### timelocal() is not available on this platform ####
return -1;

54
qse/lib/cmn/tio_get.c
View File

@ -17,6 +17,7 @@
*/
#include <qse/cmn/tio.h>
#include <qse/cmn/chr.h>
#include "mem.h"
#define STATUS_GETC_EILSEQ (1 << 0)
@ -26,9 +27,6 @@ qse_ssize_t qse_tio_getc (qse_tio_t* tio, qse_char_t* c)
qse_size_t left = 0;
qse_ssize_t n;
qse_char_t curc;
#ifndef QSE_CHAR_IS_MCHAR
qse_size_t seqlen;
#endif
/* TODO: more efficient way to check this?
* maybe better to use QSE_ASSERT
@ -79,52 +77,6 @@ qse_ssize_t qse_tio_getc (qse_tio_t* tio, qse_char_t* c)
#else
left = tio->inbuf_len - tio->inbuf_curp;
#if 0
seqlen = qse_mblen (tio->inbuf[tio->inbuf_curp], left);
if (seqlen == 0)
{
/* illegal sequence */
tio->inbuf_curp++; /* skip one byte */
tio->errnum = QSE_TIO_EILSEQ;
return -1;
}
if (seqlen > left)
{
/* incomplete sequence */
if (tio->inbuf_curp > 0)
{
QSE_MEMCPY (tio->inbuf, &tio->inbuf[tio->inbuf_curp], left);
tio->inbuf_curp = 0;
tio->inbuf_len = left;
}
goto getc_conv;
}
n = qse_mbtowc (&tio->inbuf[tio->inbuf_curp], seqlen, &curc);
if (n == 0)
{
/* illegal sequence */
tio->inbuf_curp++; /* skip one byte */
tio->errnum = QSE_TIO_EILSEQ;
return -1;
}
if (n > seqlen)
{
/* incomplete sequence -
* this check might not be needed because qse_mblen has
* checked it. would QSE_ASSERT (n <= seqlen) be enough? */
if (tio->inbuf_curp > 0)
{
QSE_MEMCPY (tio->inbuf, &tio->inbuf[tio->inbuf_curp], left);
tio->inbuf_curp = 0;
tio->inbuf_len = left;
}
goto getc_conv;
}
#endif
n = qse_mbtowc (&tio->inbuf[tio->inbuf_curp], left, &curc);
if (n == 0)
{
@ -157,13 +109,13 @@ qse_ssize_t qse_tio_gets (qse_tio_t* tio, qse_char_t* buf, qse_size_t size)
qse_ssize_t n;
if (size <= 0) return 0;
n = qse_tio_getsx (tio, buf, size - 1);
n = qse_tio_read (tio, buf, size - 1);
if (n == -1) return -1;
buf[n] = QSE_T('\0');
return n;
}
qse_ssize_t qse_tio_getsx (qse_tio_t* tio, qse_char_t* buf, qse_size_t size)
qse_ssize_t qse_tio_read (qse_tio_t* tio, qse_char_t* buf, qse_size_t size)
{
qse_ssize_t n;
qse_char_t* p, * end, c;

3
qse/lib/cmn/tio_put.c
View File

@ -17,6 +17,7 @@
*/
#include <qse/cmn/tio.h>
#include <qse/cmn/chr.h>
qse_ssize_t qse_tio_putc (qse_tio_t* tio, qse_char_t c)
{
@ -85,7 +86,7 @@ qse_ssize_t qse_tio_puts (qse_tio_t* tio, const qse_char_t* str)
return p - str;
}
qse_ssize_t qse_tio_putsx (qse_tio_t* tio, const qse_char_t* str, qse_size_t size)
qse_ssize_t qse_tio_write (qse_tio_t* tio, const qse_char_t* str, qse_size_t size)
{
qse_ssize_t n;
const qse_char_t* p, * end;