Skip to content

Commit 46736c0

Browse files
tordentorden
torden
authored andcommitted
fix build fail on travie, zend paramter p:string (a valid path) abnormal working on old version
1 parent 34985a3 commit 46736c0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/mdbm.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ PHP_FUNCTION(mdbm_set_log_filename) {
981981
_ZEND_STR_LEN path_len = 0;
982982
int rv = -1;
983983

984-
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &pfilepath,&path_len)) {
984+
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &pfilepath,&path_len)) {
985985
RETURN_FALSE;
986986
}
987987

@@ -1000,7 +1000,7 @@ PHP_FUNCTION(mdbm_open) {
10001000
MDBM *pmdbm = NULL;
10011001
php_mdbm_open *mdbm_link = NULL;
10021002

1003-
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pll|ll", &pfilepath,&path_len, &flags, &mode, &psize, &presize)) {
1003+
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|ll", &pfilepath,&path_len, &flags, &mode, &psize, &presize)) {
10041004
RETURN_FALSE;
10051005
}
10061006

@@ -1819,7 +1819,7 @@ PHP_FUNCTION(mdbm_delete_lockfiles) {
18191819

18201820
char fn[PATH_MAX] = {0x00};
18211821

1822-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &pdbfn, &dbfn_len) == FAILURE) {
1822+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &pdbfn, &dbfn_len) == FAILURE) {
18231823
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error - There was a missing parameter(s)");
18241824
RETURN_FALSE;
18251825
}

src/travis-ci-check.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
CMD_PHP=`which php`
3-
CNT=$(find ./tests/ -name "*.mem" | wc -l)
3+
CNT=$(find ./tests/ -name "*.log" -o -name "*.mem" -o -name "*.core*" | wc -l)
44
if [ $CNT -gt 0 ]; then
55
echo "[*] FAIL : $CNT";
66
ls -al ./tests/

0 commit comments

Comments
 (0)