lytboris Sun, 17 Jul 2011 14:06:05 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313325
Log:
backport r313324
Changed paths:
_U php/php-src/branches/PHP_5_4/ext/snmp/
U php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
Property changes on: php/php-src/branches/PHP_5_4/ext/snmp
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/trunk/ext/snmp:284726,311033-312092
+ /php/php-src/trunk/ext/snmp:284726,311033-313324
Modified: php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/snmp/snmp.c 2011-07-17 13:57:28 UTC
(rev 313324)
+++ php/php-src/branches/PHP_5_4/ext/snmp/snmp.c 2011-07-17 14:06:05 UTC
(rev 313325)
@@ -339,10 +339,12 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get, 0, 0, 1)
ZEND_ARG_INFO(0, object_id)
+ ZEND_ARG_INFO(0, use_orignames)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_walk, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_walk, 0, 0, 4)
ZEND_ARG_INFO(0, object_id)
+ ZEND_ARG_INFO(0, suffix_keys)
ZEND_ARG_INFO(0, non_repeaters)
ZEND_ARG_INFO(0, max_repetitions)
ZEND_END_ARG_INFO()
@@ -1749,7 +1751,7 @@
}
/* }}} */
-/* {{{ proto mixed SNMP::get_assoc(mixed object_id)
+/* {{{ proto mixed SNMP::get(mixed object_id [, bool preserve_keys])
Fetch a SNMP object returing scalar for single OID and array of oid->value
pairs for multi OID request */
PHP_METHOD(snmp, get)
{
@@ -1757,7 +1759,7 @@
}
/* }}} */
-/* {{{ proto mixed SNMP::getnext(mixed object_id)
+/* {{{ proto mixed SNMP::getnext(mixed object_id)
Fetch a SNMP object returing scalar for single OID and array of oid->value
pairs for multi OID request */
PHP_METHOD(snmp, getnext)
{
@@ -1765,7 +1767,7 @@
}
/* }}} */
-/* {{{ proto mixed SNMP::walk(mixed object_id)
+/* {{{ proto mixed SNMP::walk(mixed object_id [, bool $suffix_as_key = FALSE
[, int $non_repeaters [, int $max_repetitions ]]])
Return all objects including their respective object id withing the
specified one as array of oid->value pairs */
PHP_METHOD(snmp, walk)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
