Skip to content

Commit 31fbbc0

Browse files
committed
Fix a few more things
1 parent e143d96 commit 31fbbc0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ext/pdo/pdo_stmt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,6 @@ static void register_bound_param(INTERNAL_FUNCTION_PARAMETERS, int is_param) /*
14421442
zval *parameter, *driver_params = NULL;
14431443

14441444
memset(&param, 0, sizeof(param));
1445-
param.paramno = -1;
14461445

14471446
ZEND_PARSE_PARAMETERS_START(2, 5)
14481447
Z_PARAM_STR_OR_LONG(param.name, param.paramno)
@@ -1458,6 +1457,7 @@ static void register_bound_param(INTERNAL_FUNCTION_PARAMETERS, int is_param) /*
14581457
param.param_type = (int) param_type;
14591458

14601459
if (param.name) {
1460+
param.paramno = -1;
14611461
} else if (param.paramno > 0) {
14621462
--param.paramno; /* make it zero-based internally */
14631463
} else {
@@ -1489,9 +1489,8 @@ PHP_METHOD(PDOStatement, bindValue)
14891489
zval *parameter;
14901490

14911491
memset(&param, 0, sizeof(param));
1492-
param.paramno = -1;
14931492

1494-
ZEND_PARSE_PARAMETERS_START(2, 5)
1493+
ZEND_PARSE_PARAMETERS_START(2, 3)
14951494
Z_PARAM_STR_OR_LONG(param.name, param.paramno)
14961495
Z_PARAM_ZVAL(parameter)
14971496
Z_PARAM_OPTIONAL
@@ -1502,6 +1501,7 @@ PHP_METHOD(PDOStatement, bindValue)
15021501
param.param_type = (int) param_type;
15031502

15041503
if (param.name) {
1504+
param.paramno = -1;
15051505
} else if (param.paramno > 0) {
15061506
--param.paramno; /* make it zero-based internally */
15071507
} else {

ext/standard/tests/file/chgrp.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ try {
1313
echo $exception->getMessage() . "\n";
1414
}
1515
?>
16-
--EXPECT--
16+
--EXPECTF--
1717
Warning: chgrp(): No such file or directory in %s on line %d

ext/standard/tests/file/chown.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
1111
echo "ALIVE\n";
1212
?>
1313
--EXPECTF--
14-
Warning: chown(): No such file or directory in %s on %d
14+
Warning: chown(): No such file or directory in %s on line %d
1515
ALIVE

0 commit comments

Comments
 (0)