felipe Wed Dec 24 00:04:40 2008 UTC
Modified files:
/php-src/ext/sysvshm sysvshm.c
/php-src/ext/sysvshm/tests 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt
Log:
- Standard
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.83&r2=1.84&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.83 php-src/ext/sysvshm/sysvshm.c:1.84
--- php-src/ext/sysvshm/sysvshm.c:1.83 Mon Nov 17 11:26:24 2008
+++ php-src/ext/sysvshm/sysvshm.c Wed Dec 24 00:04:40 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.83 2008/11/17 11:26:24 felipe Exp $ */
+/* $Id: sysvshm.c,v 1.84 2008/12/24 00:04:40 felipe Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -153,7 +153,7 @@
long shm_key, shm_id, shm_size = php_sysvshm.init_mem, shm_flag = 0666;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|ll",
&shm_key, &shm_size, &shm_flag)) {
- RETURN_FALSE;
+ return;
}
if (shm_size < 1) {
@@ -209,7 +209,7 @@
sysvshm_shm *shm_list_ptr;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&shm_id)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
RETURN_BOOL(SUCCESS == zend_list_delete(Z_LVAL_P(shm_id)));
@@ -224,7 +224,7 @@
sysvshm_shm *shm_list_ptr;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&shm_id)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
@@ -249,7 +249,7 @@
php_serialize_data_t var_hash;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz",
&shm_id, &shm_key, &arg_var)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
@@ -285,7 +285,7 @@
php_unserialize_data_t var_hash;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl",
&shm_id, &shm_key)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
@@ -318,7 +318,7 @@
sysvshm_shm *shm_list_ptr;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl",
&shm_id, &shm_key)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
RETURN_BOOL(php_check_shm_data(shm_list_ptr->ptr, shm_key) >= 0);
@@ -334,7 +334,7 @@
sysvshm_shm *shm_list_ptr;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl",
&shm_id, &shm_key)) {
- RETURN_FALSE;
+ return;
}
SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sysvshm/tests/002.phpt
diff -u php-src/ext/sysvshm/tests/002.phpt:1.3
php-src/ext/sysvshm/tests/002.phpt:1.4
--- php-src/ext/sysvshm/tests/002.phpt:1.3 Wed Jul 18 13:51:50 2007
+++ php-src/ext/sysvshm/tests/002.phpt Wed Dec 24 00:04:40 2008
@@ -34,10 +34,10 @@
?>
--EXPECTF--
Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
+NULL
Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d
-bool(false)
+NULL
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sysvshm/tests/003.phpt
diff -u php-src/ext/sysvshm/tests/003.phpt:1.3
php-src/ext/sysvshm/tests/003.phpt:1.4
--- php-src/ext/sysvshm/tests/003.phpt:1.3 Mon Jun 25 17:37:48 2007
+++ php-src/ext/sysvshm/tests/003.phpt Wed Dec 24 00:04:40 2008
@@ -32,10 +32,10 @@
?>
--EXPECTF--
Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on
line %d
-bool(false)
+NULL
Warning: shm_detach() expects exactly 1 parameter, 2 given in %s003.php on
line %d
-bool(false)
+NULL
bool(true)
Warning: shm_detach(): %d is not a valid sysvshm resource in %s003.php on line
%d
@@ -44,11 +44,11 @@
Warning: shm_remove(): %d is not a valid sysvshm resource in %s003.php on line
%d
Warning: shm_detach() expects parameter 1 to be resource, integer given in
%s003.php on line %d
-bool(false)
+NULL
Warning: shm_detach() expects parameter 1 to be resource, integer given in
%s003.php on line %d
-bool(false)
+NULL
Warning: shm_detach() expects parameter 1 to be resource, integer given in
%s003.php on line %d
-bool(false)
+NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/004.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sysvshm/tests/004.phpt
diff -u php-src/ext/sysvshm/tests/004.phpt:1.2
php-src/ext/sysvshm/tests/004.phpt:1.3
--- php-src/ext/sysvshm/tests/004.phpt:1.2 Fri Oct 27 21:18:56 2006
+++ php-src/ext/sysvshm/tests/004.phpt Wed Dec 24 00:04:40 2008
@@ -25,13 +25,13 @@
--EXPECTF--
Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on
line %d
-bool(false)
+NULL
Warning: shm_put_var() expects parameter 1 to be resource, integer given in
%s004.php on line %d
-bool(false)
+NULL
Warning: shm_put_var() expects parameter 1 to be resource, integer given in
%s004.php on line %d
-bool(false)
+NULL
bool(true)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/005.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/sysvshm/tests/005.phpt
diff -u php-src/ext/sysvshm/tests/005.phpt:1.4
php-src/ext/sysvshm/tests/005.phpt:1.5
--- php-src/ext/sysvshm/tests/005.phpt:1.4 Tue May 27 02:55:51 2008
+++ php-src/ext/sysvshm/tests/005.phpt Wed Dec 24 00:04:40 2008
@@ -40,10 +40,10 @@
--EXPECTF--
Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on
line %d
-bool(false)
+NULL
Warning: shm_get_var() expects parameter 1 to be resource, integer given in
%s005.php on line %d
-bool(false)
+NULL
Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d
bool(false)
@@ -52,7 +52,7 @@
bool(false)
Warning: shm_get_var() expects parameter 2 to be long, array given in
%s005.php on line %d
-bool(false)
+NULL
unicode(11) "test string"
object(stdClass)#%d (0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/006.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/sysvshm/tests/006.phpt
diff -u php-src/ext/sysvshm/tests/006.phpt:1.4
php-src/ext/sysvshm/tests/006.phpt:1.5
--- php-src/ext/sysvshm/tests/006.phpt:1.4 Tue May 27 02:55:51 2008
+++ php-src/ext/sysvshm/tests/006.phpt Wed Dec 24 00:04:40 2008
@@ -28,10 +28,10 @@
--EXPECTF--
Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php
on line %d
-bool(false)
+NULL
Warning: shm_remove_var() expects parameter 1 to be resource, integer given in
%s006.php on line %d
-bool(false)
+NULL
Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line
%d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/007.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sysvshm/tests/007.phpt
diff -u php-src/ext/sysvshm/tests/007.phpt:1.3
php-src/ext/sysvshm/tests/007.phpt:1.4
--- php-src/ext/sysvshm/tests/007.phpt:1.3 Tue May 27 02:55:51 2008
+++ php-src/ext/sysvshm/tests/007.phpt Wed Dec 24 00:04:40 2008
@@ -24,16 +24,16 @@
--EXPECTF--
Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on
line %d
-bool(false)
+NULL
Warning: shm_remove() expects parameter 1 to be resource, integer given in
%s007.php on line %d
-bool(false)
+NULL
Warning: shm_remove() expects parameter 1 to be resource, integer given in
%s007.php on line %d
-bool(false)
+NULL
Warning: shm_remove() expects parameter 1 to be resource, Unicode string given
in %s007.php on line %d
-bool(false)
+NULL
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
