nobbie Wed Mar 5 08:17:00 2003 EDT
Modified files:
/php4/ext/informix ifx.ec
Log:
- Reverted emalloc(),efree() changed for persistant connection resources
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.87 php4/ext/informix/ifx.ec:1.88
--- php4/ext/informix/ifx.ec:1.87 Wed Mar 5 04:37:59 2003
+++ php4/ext/informix/ifx.ec Wed Mar 5 08:16:59 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.87 2003/03/05 09:37:59 nobbie Exp $ */
+/* $Id: ifx.ec,v 1.88 2003/03/05 13:16:59 nobbie Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -308,7 +308,7 @@
EXEC SQL close database;
EXEC SQL DISCONNECT CURRENT;
}
- efree(link);
+ free(link);
IFXG(num_persistent)--;
IFXG(num_links)--;
}
@@ -495,7 +495,7 @@
}
/* create the link */
- ifx = (char *) emalloc(sizeof(IFX));
+ ifx = (char *) malloc(sizeof(IFX));
IFXG(connectionid)++;
sprintf(ifx, "%s%x", SAFE_STRING(user), IFXG(connectionid));
@@ -504,7 +504,7 @@
if (ifx_check() == IFX_ERROR) {
IFXG(sv_sqlcode) = SQLCODE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
ifx_error(ifx));
- efree(ifx);
+ free(ifx);
efree(hashed_details);
RETURN_FALSE;
}
@@ -513,7 +513,7 @@
new_le.type = le_plink;
new_le.ptr = ifx;
if (zend_hash_update(&EG(persistent_list), hashed_details,
hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) {
- efree(ifx);
+ free(ifx);
efree(hashed_details);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
