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

changed pio to used param->fixed_argv if the number of arguments is <= 3

Browse Source
This commit is contained in:
hyung-hwan
2016-04-11 14:32:27 +00:00
parent 5b395db9e7
commit 9b4c897d6c
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2509,7 +2509,7 @@ QSE_EXPORT int qse_wcsspl (
* QSE_MT('\\'), QSE_MT("n\nr\r")
* );
* \endcode
* Given [xxx]:[\rabc\ndef]:[] as an input, the example breaks the second
* Given [xxx]:[\rabc\ndef]:[] as an input, the example translates the second
* fields to <CR>abc<NL>def where <CR> is a carriage return and <NL> is a
* new line.
*

16
qse/lib/cmn/pio.c
View File

@ -289,12 +289,18 @@ static int make_param (
qse_mchar_t** argv;
qse_mchar_t* mcmdptr;
param->argv = QSE_MMGR_ALLOC (
pio->mmgr, (fcnt + 1) * QSE_SIZEOF(argv[0]));
if (param->argv == QSE_NULL)
if (fcnt < QSE_COUNTOF(param->fixed_argv))
{
pio->errnum = QSE_PIO_ENOMEM;
goto oops;
param->argv = param->fixed_argv;
}
else
{
param->argv = QSE_MMGR_ALLOC (pio->mmgr, (fcnt + 1) * QSE_SIZEOF(argv[0]));
if (param->argv == QSE_NULL)
{
pio->errnum = QSE_PIO_ENOMEM;
goto oops;
}
}
mcmdptr = mcmd;

4
qse/lib/cmn/str-spl.c
View File

@ -297,7 +297,7 @@ int qse_mbsspltrn (
}
p++;
}
exit_point:
exit_point:
;
}
}
@ -583,7 +583,7 @@ int qse_wcsspltrn (
}
p++;
}
exit_point:
exit_point:
;
}
}