From 97930e91701b5723c587d320c9ec5d8d0f217eaf Mon Sep 17 00:00:00 2001 From: Boris Lytochkin Date: Tue, 10 May 2011 11:48:10 +0000 Subject: [PATCH] method renaming: SNMP::get_errno() -> SNMP::getErrno() SNMP::get_error() -> SNMP::getError() --- ext/snmp/snmp.c | 12 ++++++------ ext/snmp/tests/snmp-object-errno-errstr.phpt | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 3ee4f33a1d..1d9beb042c 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1826,9 +1826,9 @@ PHP_METHOD(snmp, setSecurity) } /* }}} */ -/* {{{ proto long SNMP::get_errno() +/* {{{ proto long SNMP::getErrno() Get last error code number */ -PHP_METHOD(snmp, get_errno) +PHP_METHOD(snmp, getErrno) { php_snmp_object *snmp_object; zval *object = getThis(); @@ -1840,9 +1840,9 @@ PHP_METHOD(snmp, get_errno) } /* }}} */ -/* {{{ proto long SNMP::error() +/* {{{ proto long SNMP::getError() Get last error message */ -PHP_METHOD(snmp, get_error) +PHP_METHOD(snmp, getError) { php_snmp_object *snmp_object; zval *object = getThis(); @@ -2294,8 +2294,8 @@ static zend_function_entry php_snmp_class_methods[] = { PHP_ME(snmp, getnext, arginfo_snmp_get, ZEND_ACC_PUBLIC) PHP_ME(snmp, walk, arginfo_snmp_walk, ZEND_ACC_PUBLIC) PHP_ME(snmp, set, arginfo_snmp_set, ZEND_ACC_PUBLIC) - PHP_ME(snmp, get_errno, arginfo_snmp_void, ZEND_ACC_PUBLIC) - PHP_ME(snmp, get_error, arginfo_snmp_void, ZEND_ACC_PUBLIC) + PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC) + PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; diff --git a/ext/snmp/tests/snmp-object-errno-errstr.phpt b/ext/snmp/tests/snmp-object-errno-errstr.phpt index 5b29ff3ee0..e01be63007 100644 --- a/ext/snmp/tests/snmp-object-errno-errstr.phpt +++ b/ext/snmp/tests/snmp-object-errno-errstr.phpt @@ -1,5 +1,5 @@ --TEST-- -OO API: get_errno & get_error functions +OO API: getErrno & getError functions --CREDITS-- Boris Lytochkin --SKIPIF-- @@ -19,29 +19,29 @@ snmp_set_oid_output_format(SNMP_OID_OUTPUT_FULL); echo "SNMP::ERRNO_NOERROR\n"; $session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries); var_dump(@$session->get('.1.3.6.1.2.1.1.1.0')); -var_dump($session->get_errno() == SNMP::ERRNO_NOERROR); -var_dump($session->get_error()); +var_dump($session->getErrno() == SNMP::ERRNO_NOERROR); +var_dump($session->getError()); $session->close(); echo "SNMP::ERRNO_TIMEOUT\n"; $session = new SNMP(SNMP_VERSION_2c, $hostname, 'timeout_community_432', $timeout, $retries); $session->valueretrieval = SNMP_VALUE_LIBRARY; var_dump(@$session->get('.1.3.6.1.2.1.1.1.0')); -var_dump($session->get_errno() == SNMP::ERRNO_TIMEOUT); -var_dump($session->get_error()); +var_dump($session->getErrno() == SNMP::ERRNO_TIMEOUT); +var_dump($session->getError()); $session->close(); echo "SNMP::ERRNO_ERROR_IN_REPLY\n"; $session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries); var_dump(@$session->get('.1.3.6.1.2.1.1.1.110')); -var_dump($session->get_errno() == SNMP::ERRNO_ERROR_IN_REPLY); -var_dump($session->get_error()); +var_dump($session->getErrno() == SNMP::ERRNO_ERROR_IN_REPLY); +var_dump($session->getError()); $session->close(); echo "SNMP::ERRNO_GENERIC\n"; $session = new SNMP(SNMP_VERSION_3, $hostname, 'somebogususer', $timeout, $retries); $session->setSecurity('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass); var_dump(@$session->get('.1.3.6.1.2.1.1.1.0')); -var_dump($session->get_errno() == SNMP::ERRNO_GENERIC); -var_dump($session->get_error()); +var_dump($session->getErrno() == SNMP::ERRNO_GENERIC); +var_dump($session->getError()); $session->close(); ?> --EXPECTF-- -- 2.50.1