cvs: php-src(PHP_5_0) /ext/standard ftok.c
| From: | Antony Dovgal | Date: | Fri, 28 Jan 2005 16:47:16 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/standard ftok.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30202@lists.php.net to get a copy of this message | ||
tony2001 Fri Jan 28 11:47:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard ftok.c
Log:
improve CS & error messages
http://cvs.php.net/diff.php/php-src/ext/standard/ftok.c?r1=1.13.2.1&r2=1.13.2.2&ty=u
Index: php-src/ext/standard/ftok.c
diff -u php-src/ext/standard/ftok.c:1.13.2.1 php-src/ext/standard/ftok.c:1.13.2.2
--- php-src/ext/standard/ftok.c:1.13.2.1 Fri Jan 28 11:33:09 2005
+++ php-src/ext/standard/ftok.c Fri Jan 28 11:47:16 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftok.c,v 1.13.2.1 2005/01/28 16:33:09 tony2001 Exp $ */
+/* $Id: ftok.c,v 1.13.2.2 2005/01/28 16:47:16 tony2001 Exp $ */
#include "php.h"
@@ -31,37 +31,36 @@
Convert a pathname and a project identifier to a System V IPC key */
PHP_FUNCTION(ftok)
{
- pval **pathname, **proj;
+ zval **pathname, **proj;
+ key_t k;
- key_t k;
+ if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pathname, &proj) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(pathname);
+ convert_to_string_ex(proj);
- if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pathname, &proj) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(pathname);
- convert_to_string_ex(proj);
-
- if (Z_STRLEN_PP(pathname)==0){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument invalid");
- RETURN_LONG(-1);
- }
-
- if (Z_STRLEN_PP(proj)!=1){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument invalid");
- RETURN_LONG(-1);
- }
+ if (Z_STRLEN_PP(pathname)==0){
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid");
+ RETURN_LONG(-1);
+ }
+
+ if (Z_STRLEN_PP(proj)!=1){
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid");
+ RETURN_LONG(-1);
+ }
if ((PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(pathname), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(Z_STRVAL_PP(pathname) TSRMLS_CC)) {
RETURN_LONG(-1);
}
- k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]);
+ k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]);
if (k == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "ftok() failed - %s", strerror(errno));
}
- RETURN_LONG(k);
+ RETURN_LONG(k);
}
/* }}} */
#endif