X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqtypes.c;h=6cf57410e03887da9ddc7e46b84ec38a420fb396;hp=e0daddecbb804670e82f9eb987fe160c31add956;hb=bffdeef967c851f5046a1dbed426f45611e507d0;hpb=88440266c0a9fa8354688b5ed0d2a6cc3bf04db5

diff --git a/src/php_pqtypes.c b/src/php_pqtypes.c
index e0dadde..6cf5741 100644
--- a/src/php_pqtypes.c
+++ b/src/php_pqtypes.c
@@ -136,6 +136,7 @@ static int php_pqtypes_object_has_dimension(zval *object, zval *member, int chec
 					return Z_TYPE_PP(data) != IS_NULL;
 				}
 				efree(key_str);
+				key_str = NULL;
 			} else {
 				if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) &data)) {
 					return Z_TYPE_PP(data) != IS_NULL;
@@ -172,9 +173,10 @@ static zval *php_pqtypes_object_read_dimension(zval *object, zval *member, int t
 				return *data;
 			}
 		}
-		if (key_str) {
-			efree(key_str);
-		}
+	}
+
+	if (key_str) {
+		efree(key_str);
 	}
 
 	return NULL;
@@ -187,7 +189,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtypes, __construct) {
 	zend_error_handling zeh;
 	zval *zconn, *znsp = NULL;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|a!", &zconn, php_pqconn_class_entry, &znsp);
@@ -205,7 +207,7 @@ static PHP_METHOD(pqtypes, __construct) {
 			obj->intern = ecalloc(1, sizeof(*obj->intern));
 			obj->intern->conn = conn_obj;
 			php_pq_object_addref(conn_obj TSRMLS_CC);
-			zend_hash_init(&obj->intern->types, 300, NULL, ZVAL_PTR_DTOR, 0);
+			zend_hash_init(&obj->intern->types, 512, NULL, ZVAL_PTR_DTOR, 0);
 
 			if (znsp) {
 				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval, znsp);
@@ -258,7 +260,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtypes, refresh) {
 	HashTable *nsp = NULL;
 	zend_error_handling zeh;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H/!", &nsp);
@@ -335,6 +337,10 @@ PHP_MINIT_FUNCTION(pqtypes)
 	php_pqtypes_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
 	php_pqtypes_class_entry->create_object = php_pqtypes_create_object;
 
+	/*
+	zend_class_implements(php_pqtypes_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess);
+	*/
+
 	memcpy(&php_pqtypes_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_pqtypes_object_handlers.read_property = php_pq_object_read_prop;
 	php_pqtypes_object_handlers.write_property = php_pq_object_write_prop;
@@ -354,14 +360,9 @@ PHP_MINIT_FUNCTION(pqtypes)
 	ph.read = php_pqtypes_object_read_connection;
 	zend_hash_add(&php_pqtypes_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
 
-#ifdef HAVE_PHP_PQ_TYPE_H
 #	undef PHP_PQ_TYPE
 #	define PHP_PQ_TYPE(name, oid) zend_declare_class_constant_long(php_pqtypes_class_entry, ZEND_STRL(name), oid TSRMLS_CC);
 #	include "php_pq_type.h"
-	zend_declare_class_constant_bool(php_pqtypes_class_entry, ZEND_STRL("DEFINED"), 1 TSRMLS_CC);
-#else
-	zend_declare_class_constant_bool(php_pqtypes_class_entry, ZEND_STRL("DEFINED"), 0 TSRMLS_CC);
-#endif
 
 	return SUCCESS;
 }