cvs: php4 /ext/sybase php_sybase_db.c
| From: | Ilia Alshanetsky | Date: | Tue, 15 Apr 2003 01:48:02 +0000 |
| Subject: | cvs: php4 /ext/sybase php_sybase_db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20285@lists.php.net to get a copy of this message | ||
iliaa Mon Apr 14 21:48:02 2003 EDT
Modified files:
/php4/ext/sybase php_sybase_db.c
Log:
Cleaner error handling.
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.47 php4/ext/sybase/php_sybase_db.c:1.48
--- php4/ext/sybase/php_sybase_db.c:1.47 Mon Apr 14 20:59:41 2003
+++ php4/ext/sybase/php_sybase_db.c Mon Apr 14 21:48:01 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.47 2003/04/15 00:59:41 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.48 2003/04/15 01:48:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -406,8 +406,7 @@
/* set a DBLOGIN record */
if ((sybase.login=dblogin())==NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Unable to allocate login record");
- efree(hashed_details);
- RETURN_FALSE;
+ goto err;
}
if (user) {
@@ -439,29 +438,20 @@
if (php_sybase_module.max_links!=-1 &&
php_sybase_module.num_links>=php_sybase_module.max_links) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Too many open links
(%d)",php_sybase_module.num_links);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
if (php_sybase_module.max_persistent!=-1 &&
php_sybase_module.num_persistent>=php_sybase_module.max_persistent) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Too many open persistent links
(%d)",php_sybase_module.num_persistent);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
/* create the link */
if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==FAIL) {
/*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Unable to connect to server:
%s",sybase_error(sybase));*/
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
if (dbsetopt(sybase.link,DBBUFFER,"2",-1)==FAIL) {
- efree(hashed_details);
- dbloginfree(sybase.login);
- dbclose(sybase.link);
- RETURN_FALSE;
+ goto err_link;
}
/* hash it up */
@@ -471,18 +461,14 @@
new_le.ptr = sybase_ptr;
if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *)
&new_le, sizeof(list_entry),NULL)==FAILURE) {
free(sybase_ptr);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_link;
}
php_sybase_module.num_persistent++;
php_sybase_module.num_links++;
} else { /* we do */
if (Z_TYPE_P(le) != php_sybase_module.le_plink) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Hashed persistent link is not a
Sybase link!");
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
sybase_ptr = (sybase_link *) le->ptr;
@@ -491,15 +477,11 @@
if ((sybase_ptr->link=PHP_SYBASE_DBOPEN(sybase_ptr->login,host))==FAIL) {
/*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Link to server lost, unable to
reconnect");*/
zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
if (dbsetopt(sybase_ptr->link,DBBUFFER,"2",-1)==FAIL) {
zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
}
}
@@ -518,9 +500,7 @@
void *ptr;
if (Z_TYPE_P(index_ptr) != le_index_ptr) {
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
link = (int) index_ptr->ptr;
ptr = zend_list_find(link,&type); /* check if the link is still there */
@@ -536,23 +516,16 @@
}
if (php_sybase_module.max_links!=-1 &&
php_sybase_module.num_links>=php_sybase_module.max_links) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Too many open links
(%d)",php_sybase_module.num_links);
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) {
/*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Unable to connect to server:
%s",sybase_error(sybase));*/
- efree(hashed_details);
- dbloginfree(sybase.login);
- RETURN_FALSE;
+ goto err_login;
}
if (dbsetopt(sybase.link,DBBUFFER,"2",-1)==FAIL) {
- efree(hashed_details);
- dbloginfree(sybase.login);
- dbclose(sybase.link);
- RETURN_FALSE;
+ goto err_link;
}
/* add it to the list */
@@ -565,15 +538,21 @@
new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
Z_TYPE(new_index_ptr) = le_index_ptr;
if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *)
&new_index_ptr, sizeof(list_entry),NULL)==FAILURE) {
- efree(hashed_details);
- dbloginfree(sybase.login);
- dbclose(sybase.link);
- RETURN_FALSE;
+ goto err_link;
}
php_sybase_module.num_links++;
}
efree(hashed_details);
php_sybase_module.default_link=Z_LVAL_P(return_value);
+ return;
+
+err_link:
+ dbclose(sybase.link);
+err_login:
+ dbloginfree(sybase.login);
+err:
+ efree(hashed_details);
+ RETURN_FALSE;
}