diff options
| author | Boris Lytochkin <lytboris@php.net> | 2011-09-02 08:09:23 +0000 |
|---|---|---|
| committer | Boris Lytochkin <lytboris@php.net> | 2011-09-02 08:09:23 +0000 |
| commit | 8c5fa2ba56e2a21f3dbfa19436ead5de56cfb029 (patch) | |
| tree | ca19738583e68e4fdd34e5ffe563c6585f135ec6 /ext/snmp | |
| parent | dc32339c3393139759084537ee930d2c3ec18bef (diff) | |
| download | php-git-8c5fa2ba56e2a21f3dbfa19436ead5de56cfb029.tar.gz | |
merge from trunk:
remove php_snmp_get_ce()
Diffstat (limited to 'ext/snmp')
| -rw-r--r-- | ext/snmp/php_snmp.h | 2 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h index 543a48689c..500d4f8df8 100644 --- a/ext/snmp/php_snmp.h +++ b/ext/snmp/php_snmp.h @@ -127,7 +127,7 @@ ZEND_END_MODULE_GLOBALS(snmp) #endif #define REGISTER_SNMP_CLASS_CONST_LONG(const_name, value) \ - zend_declare_class_constant_long(php_snmp_get_ce(), const_name, sizeof(const_name)-1, (long)value TSRMLS_CC); + zend_declare_class_constant_long(php_snmp_ce, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC); #else diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 1d2245070f..08a93a60a9 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -124,12 +124,7 @@ static int le_snmp_session; static zend_object_handlers php_snmp_object_handlers; /* Class entries */ -zend_class_entry *php_snmp_class_entry; - -zend_class_entry *php_snmp_get_ce() -{ - return php_snmp_class_entry; -} +zend_class_entry *php_snmp_ce; /* Class object properties */ static HashTable php_snmp_properties; @@ -2330,7 +2325,7 @@ PHP_MINIT_FUNCTION(snmp) INIT_CLASS_ENTRY(ce, "SNMP", php_snmp_class_methods); ce.create_object = php_snmp_object_new; php_snmp_object_handlers.clone_obj = NULL; - php_snmp_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_snmp_ce = zend_register_internal_class(&ce TSRMLS_CC); /* Register SNMP Class properties */ zend_hash_init(&php_snmp_properties, 0, NULL, NULL, 1); |