diff options
Diffstat (limited to 'ext/posix')
| -rw-r--r-- | ext/posix/package.xml | 49 | ||||
| -rw-r--r-- | ext/posix/posix.c | 16 |
2 files changed, 7 insertions, 58 deletions
diff --git a/ext/posix/package.xml b/ext/posix/package.xml deleted file mode 100644 index 231c5bee20..0000000000 --- a/ext/posix/package.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE package SYSTEM "../pear/package.dtd"> -<package> - <name>pcntl</name> - <summary>Process control functions</summary> - <maintainers> - <maintainer> - <user>???</user> - <name>Jason Greene</name> - <email>jason@inetgurus.net</email> - <role>lead</role> - </maintainer> - </maintainers> - <description> -Process Control support in PHP implements the Unix style -of process creation, program execution, signal handling -and process termination. Process Control should not be -enabled within a webserver environment and unexpected -results may happen if any Process Control functions -are used within a webserver environment. - </description> - <license>PHP</license> - <release> - <state>beta</state> - <version>5.0.0rc1</version> - <date>2004-03-19</date> - <notes> -package.xml added to support installation using pear installer - </notes> - <filelist> - <file role="doc" name="CREDITS"/> - <file role="doc" name="README"/> - <file role="src" name="config.m4"/> - <file role="src" name="pcntl.c"/> - <file role="src" name="php_pcntl.h"/> - <file role="src" name="php_signal.c"/> - <file role="src" name="php_signal.h"/> - <file role="test" name="test-pcntl.php"/> - <file role="test" name="tests/001.phpt"/> - </filelist> - <deps> - <dep type="php" rel="ge" version="5" /> - <!-- doesn't work yet <dep type="os" rel="has" name="unix"/> --> - </deps> - </release> -</package> -<!-- -vim:et:ts=1:sw=1 ---> diff --git a/ext/posix/posix.c b/ext/posix/posix.c index bb23a5bc29..cdcedb9658 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -224,7 +224,7 @@ ZEND_END_ARG_INFO() /* {{{ posix_functions[] */ -const zend_function_entry posix_functions[] = { +static const zend_function_entry posix_functions[] = { /* POSIX.1, 3.3 */ PHP_FE(posix_kill, arginfo_posix_kill) @@ -805,8 +805,7 @@ PHP_FUNCTION(posix_ttyname) } break; default: - convert_to_long_ex(z_fd); - fd = Z_LVAL_P(z_fd); + fd = zval_get_long(z_fd); } #if defined(ZTS) && defined(HAVE_TTYNAME_R) && defined(_SC_TTY_NAME_MAX) buflen = sysconf(_SC_TTY_NAME_MAX); @@ -850,8 +849,7 @@ PHP_FUNCTION(posix_isatty) } break; default: - convert_to_long_ex(z_fd); - fd = Z_LVAL_P(z_fd); + fd = zval_get_long(z_fd); } if (isatty(fd)) { @@ -1286,7 +1284,7 @@ PHP_FUNCTION(posix_getpwuid) /* {{{ posix_addlimit */ -static int posix_addlimit(int limit, char *name, zval *return_value) { +static int posix_addlimit(int limit, const char *name, zval *return_value) { int result; struct rlimit rl; char hard[80]; @@ -1319,9 +1317,9 @@ static int posix_addlimit(int limit, char *name, zval *return_value) { /* {{{ limits[] */ -struct limitlist { +static const struct limitlist { int limit; - char *name; + const char *name; } limits[] = { #ifdef RLIMIT_CORE { RLIMIT_CORE, "core" }, @@ -1380,7 +1378,7 @@ struct limitlist { Get system resource consumption limits (This is not a POSIX function, but a BSDism and a SVR4ism. We compile conditionally) */ PHP_FUNCTION(posix_getrlimit) { - struct limitlist *l = NULL; + const struct limitlist *l = NULL; PHP_POSIX_NO_ARGS; |