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

added qse_htrd_geterrnum().

Browse Source 
changed a log message in xli/err.c
This commit is contained in:
hyung-hwan 2014-11-03 15:33:15 +00:00
parent 06e55b9c7e
commit ed2cdcaa87
7 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qse/cmd/http/httpd.c
View File

@ -2272,6 +2272,7 @@ static int close_config_file (qse_httpd_t* httpd)
return 0;
}
static void set_limit (qse_httpd_t* httpd, const qse_char_t* name, int what)
{
qse_xli_pair_t* pair;

2
qse/include/qse/cmn/mbwc.h
View File

@ -454,7 +454,7 @@ QSE_EXPORT qse_mchar_t* qse_wcsntombsdup (
QSE_EXPORT qse_mchar_t* qse_wcsatombsdup (
const qse_wchar_t* wcs[],
qse_size_t* mbslen,
qse_size_t* mbslen,
qse_mmgr_t* mmgr
);

4
qse/include/qse/http/htrd.h
View File

@ -145,6 +145,10 @@ QSE_EXPORT void* qse_htrd_getxtn (
qse_htrd_t* htrd
);
QSE_EXPORT qse_htrd_errnum_t qse_htrd_geterrnum (
qse_htrd_t* htrd
);
QSE_EXPORT void qse_htrd_clear (
qse_htrd_t* htrd
);

6
qse/lib/http/htrd.c
View File

@ -475,6 +475,12 @@ void* qse_htrd_getxtn (qse_htrd_t* htrd)
return QSE_XTN (htrd);
}
qse_htrd_errnum_t qse_htrd_geterrnum (qse_htrd_t* htrd)
{
return htrd->errnum;
}
int qse_htrd_getoption (qse_htrd_t* htrd)
{
return htrd->option;

6
qse/lib/http/httpd-proxy.c
View File

@ -1796,8 +1796,10 @@ static int task_main_proxy_2 (
{
if (qse_htrd_feed (proxy->peer_htrd, proxy->buf, proxy->buflen) <= -1)
{
if (httpd->opt.trait & QSE_HTTPD_LOGACT)
log_proxy_error (proxy, "proxy feed error - ");
#if defined(QSE_HTTPD_DEBUG)
HTTPD_DBGOUT3 ("Failed to feed proxy peer response to handler - %d [%.*hs]\n",
qse_htrd_geterrnum(proxy->peer_htrd), (int)proxy->buflen, proxy->buf);
#endif
goto oops;
}

2
qse/lib/xli/err.c
View File

@ -57,7 +57,7 @@ const qse_char_t* qse_xli_dflerrstr (
QSE_T("no alias for '${0}'"),
QSE_T("illegal value for '${0}'"),
QSE_T("no value for '${0}'"),
QSE_T("too many string segments for '${0}'")
QSE_T("uncomplying number of string segments for '${0}'")
};
return (errnum >= 0 && errnum < QSE_COUNTOF(errstr))?

4
qse/lib/xli/read.c
View File

@ -869,7 +869,7 @@ static int read_pair (qse_xli_t* xli, const qse_char_t* keytag)
{
/* too many string segments for the key */
qse_xli_seterror (xli, QSE_XLI_ESTRSEG, (const qse_cstr_t*)&key, &kloc);
goto oops;
goto oops;
}
/* semicolon read. turn off NSTR */
@ -879,7 +879,7 @@ static int read_pair (qse_xli_t* xli, const qse_char_t* keytag)
else
{
qse_xli_seterror (xli, QSE_XLI_EPAVAL, QSE_STR_XSTR(xli->tok.name), &xli->tok.loc);
goto oops;
goto oops;
}