cvs: /php4 MODULES_STATUS /php4/ext/informix ifx.ec php_informix.h
| From: | Danny Heijl | Date: | Wed, 21 Jul 1999 12:48:35 +0000 |
| Subject: | cvs: /php4 MODULES_STATUS /php4/ext/informix ifx.ec php_informix.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-2418@lists.php.net to get a copy of this message | ||
danny Wed Jul 21 08:48:35 1999 EDT
Modified files:
/php4 MODULES_STATUS
/php4/ext/informix ifx.ec php_informix.h
Log:
Started php4/ZTS port of Informix driver.
Index: php4/MODULES_STATUS
diff -u php4/MODULES_STATUS:1.8 php4/MODULES_STATUS:1.9
--- php4/MODULES_STATUS:1.8 Mon Jul 19 16:27:48 1999
+++ php4/MODULES_STATUS Wed Jul 21 08:48:34 1999
@@ -2,7 +2,7 @@
------ ------
MySQL Working
COM Working
-WDDX Working
+WDDX Not yet ported
PCRE Working
DBA Not yet ported
mcrypt Working
@@ -14,3 +14,4 @@
oci8 Working (but no blob-support yet)
oracle Working
iptc Working
+informix being ported (compiles but does not work yet)
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.6 php4/ext/informix/ifx.ec:1.7
--- php4/ext/informix/ifx.ec:1.6 Mon Jul 19 10:24:07 1999
+++ php4/ext/informix/ifx.ec Wed Jul 21 08:48:34 1999
@@ -115,19 +115,17 @@
#include "dl/phpdl.h"
#endif
-//
-// php 3.0
-//#if defined(THREAD_SAFE)
-//#include "tls.h"
-//DWORD InformixTls;
-//static int numthreads=0;
-//void *ifx_mutex;
-//#endif
+#include "php.h"
+#include "php_globals.h"
+#include "ext/standard/php3_standard.h"
+#include "php_informix.h"
+#include "php_globals.h"
+
+
#if WIN32|WINNT
#include <winsock.h>
#else
-#include "config.h"
#include "build-defs.h"
#if HAVE_SYS_TYPES_H
@@ -137,10 +135,7 @@
#include <netinet/in.h>
#endif
-#include "php.h"
-#include "php3_string.h"
-#include "build-defs.h"
-#include "php_informix.h"
+#include "php_ini.h"
#if HAVE_IFX
@@ -194,8 +189,6 @@
typedef char IFX[128];
-#include "php3_list.h"
-
#define SAFE_STRING(s) ((s)?(s):"")
function_entry ifx_functions[] = {
@@ -268,25 +261,14 @@
}
#endif
#endif
-
-
-#if defined(THREAD_SAFE)
-typedef struct ifx_global_struct{
- ifx_module php3_ifx_module;
-}ifx_global_struct;
-
-#define Informix_GLOBAL(a) ifx_globals->a
-
-#define Informix_TLS_VARS \
- ifx_global_struct *ifx_globals; \
- ifx_globals=TlsGetValue(InformixTls);
+#ifdef ZTS
+int ifx_globals_id;
#else
-#define Informix_GLOBAL(a) a
-#define Informix_TLS_VARS
-ifx_module php3_ifx_module;
+PHP_IFX_API php_ifx_globals ifx_globals;
#endif
+
#define CHECK_LINK(link) { \
if (link==0) { \
php3_error(E_WARNING, \
@@ -336,11 +318,13 @@
char *ifx_err_msg;
char c;
int errorcode;
+
+ IFXLS_FETCH();
- if (Informix_GLOBAL(php3_ifx_module).sv_sqlcode == 0)
+ if (IFXG(sv_sqlcode) == 0)
errorcode = SQLCODE;
else
- errorcode = Informix_GLOBAL(php3_ifx_module).sv_sqlcode;
+ errorcode = IFXG(sv_sqlcode);
switch (ifx_check()) {
case IFX_SUCCESS:
@@ -379,12 +363,12 @@
EXEC SQL END DECLARE SECTION;
{
- Informix_TLS_VARS;
+ IFXLS_FETCH();
EXEC SQL SET CONNECTION :link;
EXEC SQL DISCONNECT CURRENT;
efree(link);
- Informix_GLOBAL(php3_ifx_module).num_links--;
+ IFXG(num_links)--;
}
static void _close_ifx_plink(link)
@@ -393,14 +377,14 @@
EXEC SQL END DECLARE SECTION;
{
- Informix_TLS_VARS;
+ IFXLS_FETCH();
EXEC SQL SET CONNECTION :link;
EXEC SQL DISCONNECT CURRENT;
free(link);
- Informix_GLOBAL(php3_ifx_module).num_persistent--;
- Informix_GLOBAL(php3_ifx_module).num_links--;
+ IFXG(num_persistent)--;
+ IFXG(num_links)--;
}
static void ifx_free_result(a_result_id)
@@ -429,79 +413,79 @@
#endif
if (cfg_get_long("ifx.blobinfile",
- &Informix_GLOBAL(php3_ifx_module).blobinfile)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).blobinfile=BLOBINFILE;
+ &IFXG(blobinfile))==FAILURE) {
+ IFXG(blobinfile)=BLOBINFILE;
}
if (cfg_get_long("ifx.textasvarchar",
- &Informix_GLOBAL(php3_ifx_module).textasvarchar)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).textasvarchar=0;
+ &IFXG(textasvarchar))==FAILURE) {
+ IFXG(textasvarchar)=0;
}
if (cfg_get_long("ifx.byteasvarchar",
- &Informix_GLOBAL(php3_ifx_module).byteasvarchar)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).byteasvarchar=0;
+ &IFXG(byteasvarchar))==FAILURE) {
+ IFXG(byteasvarchar)=0;
}
if (cfg_get_long("ifx.charasvarchar",
- &Informix_GLOBAL(php3_ifx_module).charasvarchar)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).charasvarchar=0;
+ &IFXG(charasvarchar))==FAILURE) {
+ IFXG(charasvarchar)=0;
}
if (cfg_get_long("ifx.nullformat",
- &Informix_GLOBAL(php3_ifx_module).nullformat)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).nullformat=0;
+ &IFXG(nullformat))==FAILURE) {
+ IFXG(nullformat)=0;
}
- Informix_GLOBAL(php3_ifx_module).nullvalue = malloc(1);
- Informix_GLOBAL(php3_ifx_module).nullvalue[0] = 0;
- Informix_GLOBAL(php3_ifx_module).nullstring = malloc(5);
- strcpy(Informix_GLOBAL(php3_ifx_module).nullstring, "NULL");
+ IFXG(nullvalue) = malloc(1);
+ IFXG(nullvalue)[0] = 0;
+ IFXG(nullstring) = malloc(5);
+ strcpy(IFXG(nullstring), "NULL");
if (cfg_get_long("ifx.allow_persistent",
- &Informix_GLOBAL(php3_ifx_module).allow_persistent)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).allow_persistent=1;
+ &IFXG(allow_persistent))==FAILURE) {
+ IFXG(allow_persistent)=1;
}
if (cfg_get_long("ifx.max_persistent",
- &Informix_GLOBAL(php3_ifx_module).max_persistent)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).max_persistent=-1;
+ &IFXG(max_persistent))==FAILURE) {
+ IFXG(max_persistent)=-1;
}
if (cfg_get_long("ifx.max_links",
- &Informix_GLOBAL(php3_ifx_module).max_links)==FAILURE) {
- Informix_GLOBAL(php3_ifx_module).max_links=-1;
+ &IFXG(max_links))==FAILURE) {
+ IFXG(max_links)=-1;
}
if (cfg_get_string("ifx.default_host",
- &Informix_GLOBAL(php3_ifx_module).default_host)==FAILURE
- || Informix_GLOBAL(php3_ifx_module).default_host[0]==0) {
- Informix_GLOBAL(php3_ifx_module).default_host=NULL;
+ &IFXG(default_host))==FAILURE
+ || IFXG(default_host)[0]==0) {
+ IFXG(default_host)=NULL;
}
if (cfg_get_string("ifx.default_user",
- &Informix_GLOBAL(php3_ifx_module).default_user)==FAILURE
- || Informix_GLOBAL(php3_ifx_module).default_user[0]==0) {
- Informix_GLOBAL(php3_ifx_module).default_user=NULL;
+ &IFXG(default_user))==FAILURE
+ || IFXG(default_user)[0]==0) {
+ IFXG(default_user)=NULL;
}
if (cfg_get_string("ifx.default_password",
- &Informix_GLOBAL(php3_ifx_module).default_password)==FAILURE
- || Informix_GLOBAL(php3_ifx_module).default_password[0]==0) {
- Informix_GLOBAL(php3_ifx_module).default_password=NULL;
- }
- Informix_GLOBAL(php3_ifx_module).num_persistent=0;
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode=0;
- Informix_GLOBAL(php3_ifx_module).le_result =
+ &IFXG(default_password))==FAILURE
+ || IFXG(default_password)[0]==0) {
+ IFXG(default_password)=NULL;
+ }
+ IFXG(num_persistent)=0;
+ IFXG(sv_sqlcode)=0;
+ IFXG(le_result) =
register_list_destructors(ifx_free_result,NULL);
- Informix_GLOBAL(php3_ifx_module).le_idresult =
+ IFXG(le_idresult) =
register_list_destructors(ifx_free_result,NULL);
- Informix_GLOBAL(php3_ifx_module).le_link =
+ IFXG(le_link) =
register_list_destructors(_close_ifx_link,NULL);
- Informix_GLOBAL(php3_ifx_module).le_plink =
+ IFXG(le_plink) =
register_list_destructors(NULL,_close_ifx_plink);
#if 0
printf("Registered: %d,%d,%d\n",
- Informix_GLOBAL(php3_ifx_module).le_result,
- Informix_GLOBAL(php3_ifx_module).le_link,
- Informix_GLOBAL(php3_ifx_module).le_plink);
+ IFXG(le_result),
+ IFXG(le_link),
+ IFXG(le_plink));
#endif
ifx_module_entry.type = type;
@@ -520,9 +504,9 @@
}
-int php3_mshutdown_ifx(void){
+int php3_mshutdown_ifx(SHUTDOWN_FUNC_ARGS){
#if defined(THREAD_SAFE)
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if (ifx_globals != 0)
LocalFree((HLOCAL) ifx_globals);
SET_MUTEX(ifx_mutex);
@@ -540,30 +524,30 @@
int php3_rinit_ifx(INIT_FUNC_ARGS)
{
- Informix_TLS_VARS;
+ IFXLS_FETCH();
- Informix_GLOBAL(php3_ifx_module).default_link=-1;
- Informix_GLOBAL(php3_ifx_module).num_links =
- Informix_GLOBAL(php3_ifx_module).num_persistent;
+ IFXG(default_link)=-1;
+ IFXG(num_links) =
+ IFXG(num_persistent);
return SUCCESS;
}
-void php3_info_ifx(void)
+void php3_info_ifx(ZEND_MODULE_INFO_FUNC_ARGS)
{
char maxp[16],maxl[16];
- Informix_TLS_VARS;
+ IFXLS_FETCH();
- if (Informix_GLOBAL(php3_ifx_module).max_persistent==-1) {
+ if (IFXG(max_persistent)==-1) {
strcpy(maxp,"Unlimited");
} else {
- snprintf(maxp,15,"%ld",Informix_GLOBAL(php3_ifx_module).max_persistent);
+ snprintf(maxp,15,"%ld",IFXG(max_persistent));
maxp[15]=0;
}
- if (Informix_GLOBAL(php3_ifx_module).max_links==-1) {
+ if (IFXG(max_links)==-1) {
strcpy(maxl,"Unlimited");
} else {
- snprintf(maxl,15,"%ld",Informix_GLOBAL(php3_ifx_module).max_links);
+ snprintf(maxl,15,"%ld",IFXG(max_links));
maxl[15]=0;
}
php3_printf("<table cellpadding=5>"
@@ -578,9 +562,9 @@
"IFX_LIBS=%s<br></tt></td></tr>"
#endif
"</table>\n",
- (Informix_GLOBAL(php3_ifx_module).allow_persistent?"Yes":"No"),
- Informix_GLOBAL(php3_ifx_module).num_persistent,maxp,
- Informix_GLOBAL(php3_ifx_module).num_links,maxl,
+ (IFXG(allow_persistent)?"Yes":"No"),
+ IFXG(num_persistent),maxp,
+ IFXG(num_links),maxl,
(double)(CLIENT_SQLI_VER/100.0)
#if !(WIN32|WINNT)
,PHP_IFX_INCLUDE,
@@ -609,9 +593,11 @@
char *hashed_details;
int hashed_details_length;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
- if (php3_ini.sql_safe_mode) {
+ PLS_FETCH();
+
+ if (PG(sql_safe_mode)) {
if (ARG_COUNT(ht)>0) {
php3_error(E_NOTICE,
"SQL safe mode in effect - ignoring host/user/password information");
@@ -622,9 +608,9 @@
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"ifx__%s_",user);
} else {
- host = Informix_GLOBAL(php3_ifx_module).default_host;
- user = Informix_GLOBAL(php3_ifx_module).default_user;
- passwd = Informix_GLOBAL(php3_ifx_module).default_password;
+ host = IFXG(default_host);
+ user = IFXG(default_user);
+ passwd = IFXG(default_password);
switch(ARG_COUNT(ht)) {
case 0: /* defaults */
@@ -681,9 +667,9 @@
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
- if (!Informix_GLOBAL(php3_ifx_module).allow_persistent) {
+ if (!IFXG(allow_persistent)) {
persistent=0;
}
if (persistent) {
@@ -694,37 +680,37 @@
(void **) &le)==FAILURE) { /* we don't */
list_entry new_le;
- if (Informix_GLOBAL(php3_ifx_module).max_links!=-1 &&
- Informix_GLOBAL(php3_ifx_module).num_links >=
- Informix_GLOBAL(php3_ifx_module).max_links) {
+ if (IFXG(max_links)!=-1 &&
+ IFXG(num_links) >=
+ IFXG(max_links)) {
php3_error(E_WARNING,
"Informix: Too many open links (%d)",
- Informix_GLOBAL(php3_ifx_module).num_links);
+ IFXG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
- if (Informix_GLOBAL(php3_ifx_module).max_persistent!=-1 &&
- Informix_GLOBAL(php3_ifx_module).num_persistent >=
- Informix_GLOBAL(php3_ifx_module).max_persistent) {
+ if (IFXG(max_persistent)!=-1 &&
+ IFXG(num_persistent) >=
+ IFXG(max_persistent)) {
php3_error(E_WARNING,
"Informix: Too many open persistent links (%d)",
- Informix_GLOBAL(php3_ifx_module).num_persistent);
+ IFXG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
/* create the link */
ifx = (char *)malloc(sizeof(IFX));
- Informix_GLOBAL(php3_ifx_module).connectionid++;
+ IFXG(connectionid)++;
sprintf(ifx,"%s%x",
user,
- Informix_GLOBAL(php3_ifx_module).connectionid);
+ IFXG(connectionid));
EXEC SQL CONNECT TO :host AS :ifx
USER :user USING :passwd
WITH CONCURRENT TRANSACTION;
if (ifx_check() == IFX_ERROR) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,ifx_error(ifx));
free(ifx);
efree(hashed_details);
@@ -732,7 +718,7 @@
}
/* hash it up */
- new_le.type = Informix_GLOBAL(php3_ifx_module).le_plink;
+ new_le.type = IFXG(le_plink);
new_le.ptr = ifx;
if (_php3_hash_update(plist, hashed_details,
hashed_details_length+1,
@@ -741,10 +727,10 @@
efree(hashed_details);
RETURN_FALSE;
}
- Informix_GLOBAL(php3_ifx_module).num_persistent++;
- Informix_GLOBAL(php3_ifx_module).num_links++;
+ IFXG(num_persistent)++;
+ IFXG(num_links)++;
} else { /* we do */
- if (le->type != Informix_GLOBAL(php3_ifx_module).le_plink) {
+ if (le->type != IFXG(le_plink)) {
RETURN_FALSE;
}
/* ensure that the link did not die */
@@ -758,7 +744,7 @@
WITH CONCURRENT TRANSACTION;
if (ifx_check() == IFX_ERROR) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,
"Informix: Link to server lost, unable to reconnect
(%s)",
ifx_error(ifx));
@@ -771,7 +757,7 @@
ifx = le->ptr;
}
return_value->value.lval = php3_list_insert(ifx,
- Informix_GLOBAL(php3_ifx_module).le_plink);
+ IFXG(le_plink));
return_value->type = IS_LONG;
} else { /* non persistent */
list_entry *index_ptr,new_index_ptr;
@@ -791,10 +777,10 @@
}
link = (int) index_ptr->ptr;
ptr = php3_list_find(link,&type); /* check if the link is still there */
- if (ptr && (type==Informix_GLOBAL(php3_ifx_module).le_link ||
- type==Informix_GLOBAL(php3_ifx_module).le_plink)) {
+ if (ptr && (type==IFXG(le_link) ||
+ type==IFXG(le_plink))) {
return_value->value.lval =
- Informix_GLOBAL(php3_ifx_module).default_link =
+ IFXG(default_link) =
link;
return_value->type = IS_LONG;
efree(hashed_details);
@@ -803,25 +789,25 @@
_php3_hash_del(list,hashed_details,hashed_details_length+1);
}
}
- if (Informix_GLOBAL(php3_ifx_module).max_links != -1 &&
- Informix_GLOBAL(php3_ifx_module).num_links >=
- Informix_GLOBAL(php3_ifx_module).max_links) {
+ if (IFXG(max_links) != -1 &&
+ IFXG(num_links) >=
+ IFXG(max_links)) {
php3_error(E_WARNING,
"Informix: Too many open links (%d)",
- Informix_GLOBAL(php3_ifx_module).num_links);
+ IFXG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
ifx = (char *) emalloc(sizeof(IFX));
- Informix_GLOBAL(php3_ifx_module).connectionid++;
+ IFXG(connectionid)++;
sprintf(ifx,"connec%x",
- Informix_GLOBAL(php3_ifx_module).connectionid);
+ IFXG(connectionid));
EXEC SQL CONNECT TO :host AS :ifx
USER :user USING :passwd
WITH CONCURRENT TRANSACTION;
if (ifx_check() == IFX_ERROR) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"ifx_pconnect : %s", ifx_error(ifx));
efree(hashed_details);
efree(ifx);
@@ -830,7 +816,7 @@
/* add it to the list */
return_value->value.lval =
- php3_list_insert(ifx,Informix_GLOBAL(php3_ifx_module).le_link);
+ php3_list_insert(ifx,IFXG(le_link));
return_value->type = IS_LONG;
/* add it to the hash */
@@ -844,10 +830,10 @@
efree(hashed_details);
RETURN_FALSE;
}
- Informix_GLOBAL(php3_ifx_module).num_links++;
+ IFXG(num_links)++;
}
efree(hashed_details);
- Informix_GLOBAL(php3_ifx_module).default_link=return_value->value.lval;
+ IFXG(default_link)=return_value->value.lval;
}
@@ -869,16 +855,16 @@
static int php3_ifx_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
- Informix_TLS_VARS;
+ IFXLS_FETCH();
- if (Informix_GLOBAL(php3_ifx_module).default_link==-1) { /* no link opened yet, implicitly open
one */
+ if (IFXG(default_link)==-1) { /* no link opened yet, implicitly open one */
HashTable tmp;
_php3_hash_init(&tmp,0,NULL,NULL,0);
- php3_ifx_do_connect(&tmp,return_value,list,plist,0);
+ php3_ifx_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
_php3_hash_destroy(&tmp);
}
- return Informix_GLOBAL(php3_ifx_module).default_link;
+ return IFXG(default_link);
}
/* ----------------------------------------------------------------------
@@ -900,13 +886,13 @@
char *ifx;
EXEC SQL END DECLARE SECTION;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch (ARG_COUNT(ht)) {
case 0:
- id = Informix_GLOBAL(php3_ifx_module).default_link;
+ id = IFXG(default_link);
break;
case 1:
if (getParameters(ht, 1, &ifx_link)==FAILURE) {
@@ -920,11 +906,11 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
ifx = (char *) php3_list_find(id,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_link &&
- type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+ if (type!=IFXG(le_link) &&
+ type!=IFXG(le_plink)) {
php3_error(E_WARNING,
"ifx_close : %d (type %d) is not an Informix link index",
id,
@@ -1002,13 +988,13 @@
int query_type;
int cursoryproc;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if(ARG_COUNT(ht)<2) {
WRONG_PARAM_COUNT;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
/* get the first 2 parameters */
if (getParameters(ht, 2, &query, &ifx_link)==FAILURE) {
@@ -1018,8 +1004,8 @@
id = ifx_link->value.lval;
ifx = (char *) php3_list_find(id,&type);
- if (type != Informix_GLOBAL(php3_ifx_module).le_link &&
- type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+ if (type != IFXG(le_link) &&
+ type!=IFXG(le_plink)) {
php3_error(E_WARNING,
"ifx_query : %d (type %d) is not a Informix link index",
id,
@@ -1032,14 +1018,14 @@
convert_to_string(query);
statement = query->value.str.val;
- Informix_GLOBAL(php3_ifx_module).cursorid++;
- sprintf(statemid, "statem%x", Informix_GLOBAL(php3_ifx_module).cursorid);
- sprintf(cursorid, "cursor%x", Informix_GLOBAL(php3_ifx_module).cursorid);
- sprintf(descrpid, "descrp%x", Informix_GLOBAL(php3_ifx_module).cursorid);
+ IFXG(cursorid)++;
+ sprintf(statemid, "statem%x", IFXG(cursorid));
+ sprintf(cursorid, "cursor%x", IFXG(cursorid));
+ sprintf(descrpid, "descrp%x", IFXG(cursorid));
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -1047,7 +1033,7 @@
}
EXEC SQL PREPARE :statemid FROM :statement;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Prepare fails (%s)",
ifx_error(ifx));
RETURN_FALSE;
@@ -1058,7 +1044,7 @@
EXEC SQL ALLOCATE DESCRIPTOR :descrpid WITH MAX 256;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Allocate desciptor <%s> fails (%s)",
descrpid,
ifx_error(ifx));
@@ -1067,7 +1053,7 @@
}
EXEC SQL DESCRIBE :statemid USING SQL DESCRIPTOR :descrpid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Describe fails (%s)",
ifx_error(ifx));
EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
@@ -1182,7 +1168,7 @@
EXEC SQL EXECUTE :statemid;
}
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Execute immediate fails : %s (%s)",
statement,
ifx_error(ifx));
@@ -1226,7 +1212,7 @@
EXEC SQL GET DESCRIPTOR :descrpid :fieldcount = COUNT;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Can not get descriptor %s (%s)",
descrpid,
ifx_error(ifx));
@@ -1255,7 +1241,7 @@
EXEC SQL DECLARE :cursorid CURSOR FOR :statemid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Declare cursor fails (%s)", ifx_error(ifx));
efree(Ifx_Result);
EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
@@ -1264,7 +1250,7 @@
}
EXEC SQL OPEN :cursorid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Open cursor fails (%s)", ifx_error(ifx));
efree(Ifx_Result);
EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
@@ -1296,7 +1282,7 @@
EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
}
if(fieldtype==SQLBYTES) {
- if(Informix_GLOBAL(php3_ifx_module).blobinfile==0) {
+ if(IFXG(blobinfile)==0) {
bid=php3_intifx_create_blob(TYPE_BLBYTE,BLMODE_INMEM,"",-1,list);
locator=php3_intifx_get_blobloc(bid,list);
} else {
@@ -1324,7 +1310,7 @@
}
- RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result));
+ RETURN_LONG(php3_list_insert(Ifx_Result,IFXG(le_result)));
}
/* }}} */
@@ -1384,13 +1370,13 @@
int query_type;
int cursoryproc;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if(ARG_COUNT(ht)<2) {
WRONG_PARAM_COUNT;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
/* get the first 2 parameters */
if (getParameters(ht, 2, &query, &ifx_link)==FAILURE) {
@@ -1400,8 +1386,8 @@
id = ifx_link->value.lval;
ifx = (char *) php3_list_find(id,&type);
- if (type != Informix_GLOBAL(php3_ifx_module).le_link &&
- type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+ if (type != IFXG(le_link) &&
+ type!=IFXG(le_plink)) {
php3_error(E_WARNING,
"ifx_query : %d (type %d) is not a Informix link index",
id,
@@ -1415,14 +1401,14 @@
convert_to_string(query);
statement = query->value.str.val;
- Informix_GLOBAL(php3_ifx_module).cursorid++;
- sprintf(statemid, "statem%x", Informix_GLOBAL(php3_ifx_module).cursorid);
- sprintf(cursorid, "cursor%x", Informix_GLOBAL(php3_ifx_module).cursorid);
- sprintf(descrpid, "descrp%x", Informix_GLOBAL(php3_ifx_module).cursorid);
+ IFXG(cursorid)++;
+ sprintf(statemid, "statem%x", IFXG(cursorid));
+ sprintf(cursorid, "cursor%x", IFXG(cursorid));
+ sprintf(descrpid, "descrp%x", IFXG(cursorid));
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -1430,7 +1416,7 @@
}
EXEC SQL PREPARE :statemid FROM :statement;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Prepare fails (%s)",
ifx_error(ifx));
RETURN_FALSE;
@@ -1439,7 +1425,7 @@
for (e = 0; e < 6; e++) sqlerrd[e] = sqlca.sqlerrd[e];
EXEC SQL ALLOCATE DESCRIPTOR :descrpid WITH MAX 256;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Allocate desciptor <%s> fails (%s)",
descrpid,
ifx_error(ifx));
@@ -1448,7 +1434,7 @@
}
EXEC SQL DESCRIBE :statemid USING SQL DESCRIPTOR :descrpid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Describe fails (%s)",
ifx_error(ifx));
EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
@@ -1460,7 +1446,7 @@
Ifx_Result = (IFX_RES *)emalloc(sizeof(IFX_RES));
if (Ifx_Result == NULL) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Out of memory allocating IFX_RES");
EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
EXEC SQL free :statemid;
@@ -1592,7 +1578,7 @@
for (e = 0; e < 6; e++) Ifx_Result->sqlerrd[e] = sqlerrd[e];
EXEC SQL GET DESCRIPTOR :descrpid :fieldcount = COUNT;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Can not get descriptor %s (%s)",
descrpid,
ifx_error(ifx));
@@ -1611,7 +1597,7 @@
} /* if select */
- RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result));
+ RETURN_LONG(php3_list_insert(Ifx_Result,IFXG(le_result)));
}
/* }}} */
@@ -1657,7 +1643,7 @@
int locind;
char *blobfilename;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch(ARG_COUNT(ht)) {
case 0:
@@ -1675,9 +1661,9 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not an Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -1691,7 +1677,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -1710,7 +1696,7 @@
EXEC SQL EXECUTE :statemid;
}
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Execute immediate fails : %s ",
ifx_error(ifx));
RETURN_FALSE;
@@ -1730,13 +1716,13 @@
EXEC SQL DECLARE :cursorid CURSOR FOR :statemid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Declare cursor fails (%s)", ifx_error(ifx));
RETURN_FALSE;
}
EXEC SQL OPEN :cursorid;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Open cursor fails (%s)", ifx_error(ifx));
RETURN_FALSE;
}
@@ -1761,7 +1747,7 @@
EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
}
if(fieldtype==SQLBYTES) {
- if(Informix_GLOBAL(php3_ifx_module).blobinfile==0) {
+ if(IFXG(blobinfile)==0) {
bid=php3_intifx_create_blob(TYPE_BLBYTE,BLMODE_INMEM,"",-1,list);
locator=php3_intifx_get_blobloc(bid,list);
} else {
@@ -1811,12 +1797,12 @@
{
pval *ifx_link;
int id;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch(ARG_COUNT(ht)) {
case 0:
- id = Informix_GLOBAL(php3_ifx_module).default_link;
+ id = IFXG(default_link);
break;
case 1:
if (getParameters(ht, 1, &ifx_link)==FAILURE) {
@@ -1855,14 +1841,14 @@
char *ifx_errmsg;
char * returnmsg;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch(ARG_COUNT(ht)) {
case 0:
- if (Informix_GLOBAL(php3_ifx_module).sv_sqlcode == 0)
+ if (IFXG(sv_sqlcode) == 0)
ifx_errorcode = SQLCODE;
else
- ifx_errorcode = Informix_GLOBAL(php3_ifx_module).sv_sqlcode;
+ ifx_errorcode = IFXG(sv_sqlcode);
break;
case 1:
if (getParameters(ht, 1, &errcode)==FAILURE) {
@@ -1916,7 +1902,7 @@
int type;
IFX_RES *Ifx_Result;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch(ARG_COUNT(ht)) {
case 0:
@@ -1934,9 +1920,9 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode )= 0;
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not an Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -2016,7 +2002,7 @@
char *nullstr;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch(ARG_COUNT(ht)) {
case 0:
@@ -2052,9 +2038,9 @@
nullstr=php3_intifx_null();
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not an Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -2072,7 +2058,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -2113,7 +2099,7 @@
if(SQLCODE!=-451) {
switch (ifx_check()) {
case IFX_ERROR:
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,
"Can not fetch row on cursor %s (%s)",
ifx_error(ifx),
@@ -2141,7 +2127,7 @@
:fieldleng = LENGTH,
:indicator = INDICATOR;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
i,
ifx_error(ifx));
@@ -2156,9 +2142,9 @@
sprintf(fieldname, "[Expr_%d]", i);
if (indicator == -1) { /* NULL */
- if((Informix_GLOBAL(php3_ifx_module).textasvarchar==0
+ if((IFXG(textasvarchar)==0
&& fieldtype==SQLTEXT)
- || (Informix_GLOBAL(php3_ifx_module).byteasvarchar==0
+ || (IFXG(byteasvarchar)==0
&& fieldtype==SQLBYTES)) {
bid_b=Ifx_Result->res_id[locind];
@@ -2260,7 +2246,7 @@
RETURN_FALSE;
}
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
- if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+ if (IFXG(charasvarchar) != 0
&& (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
ldchar(char_data, fieldleng, char_data);
}
@@ -2309,9 +2295,9 @@
/* note that in case of "blobinfile" */
/* you get the file name */
/* a new one for every row ! */
- if((Informix_GLOBAL(php3_ifx_module).textasvarchar!=0
+ if((IFXG(textasvarchar)!=0
&& fieldtype==SQLTEXT)
- || (Informix_GLOBAL(php3_ifx_module).byteasvarchar!=0
+ || (IFXG(byteasvarchar)!=0
&& fieldtype==SQLBYTES)) {
char *content;
long lg;
@@ -2406,7 +2392,7 @@
char *table_options;
int moredata;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch (ARG_COUNT(ht)) {
case 1:
@@ -2426,12 +2412,12 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,
"%d is not a Informix result index",result->value.lval);
RETURN_FALSE;
@@ -2450,7 +2436,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -2462,7 +2448,7 @@
EXEC SQL FETCH :cursorid USING SQL DESCRIPTOR :descrpid;
switch (ifx_check()) {
case IFX_ERROR:
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,
"Can not fetch next row on cursor %s (%s)",
ifx_error(ifx),
@@ -2494,7 +2480,7 @@
for (i = 1; i <= num_fields; i++) {
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldname = NAME;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
i,
ifx_error(ifx));
@@ -2521,7 +2507,7 @@
:fieldleng = LENGTH,
:indicator = INDICATOR;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
i,
ifx_error(ifx));
@@ -2616,7 +2602,7 @@
RETURN_FALSE;
}
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
- if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+ if (IFXG(charasvarchar) != 0
&& (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
ldchar(char_data, fieldleng, char_data);
}
@@ -2680,7 +2666,7 @@
EXEC SQL FETCH :cursorid USING SQL DESCRIPTOR :descrpid;
switch (ifx_check()) {
case IFX_ERROR:
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,
"Can not fetch next row on cursor %s (%s)",
ifx_error(ifx),
@@ -2740,7 +2726,7 @@
char *p;
char *table_options;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch (ARG_COUNT(ht)) {
case 1:
@@ -2760,12 +2746,12 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,
"%d is not a Informix result index",result->value.lval);
RETURN_FALSE;
@@ -2784,7 +2770,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -2799,7 +2785,7 @@
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldname = NAME,
:fieldtype = TYPE;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
i,
ifx_error(ifx));
@@ -2935,7 +2921,7 @@
char *p;
char *table_options;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
switch (ARG_COUNT(ht)) {
case 1:
@@ -2955,12 +2941,12 @@
break;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,
"%d is not a Informix result index",result->value.lval);
RETURN_FALSE;
@@ -2979,7 +2965,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -2999,7 +2985,7 @@
:scale = SCALE,
:isnullable = NULLABLE;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
i,
ifx_error(ifx));
@@ -3113,18 +3099,18 @@
pval *result;
IFX_RES *Ifx_Result;
int type;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not a Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -3156,18 +3142,18 @@
char fieldname[16];
int e;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not a Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -3204,18 +3190,18 @@
pval *result;
IFX_RES *Ifx_Result;
int type;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode) = 0;
convert_to_long(result);
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not a Informix result index",
result->value.lval);
RETURN_FALSE;
@@ -3256,7 +3242,7 @@
int i, locind;
- Informix_TLS_VARS;
+ IFXLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
@@ -3270,13 +3256,13 @@
Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+ if (type!=IFXG(le_result)) {
php3_error(E_WARNING,"%d is not a Informix result index",
result->value.lval);
RETURN_FALSE;
}
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+ IFXG(sv_sqlcode = 0);
for (i = 0; i < MAX_RESID; ++i) {
@@ -3293,7 +3279,7 @@
EXEC SQL set connection :ifx;
if (ifx_check() < 0) {
- Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+ IFXG(sv_sqlcode) = SQLCODE;
php3_error(E_WARNING,"Set connection %s fails (%s)",
ifx,
ifx_error(ifx));
@@ -3337,7 +3323,7 @@
int type;
Ifx_res = (IFX_IDRES *) php3_list_find(id,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult) {
+ if (type!=IFXG(le_idresult)) {
php3_error(E_WARNING,"%d is not a Informix id-result index",
id);
return -1;
@@ -3457,7 +3443,7 @@
Ifx_blob->BLOB.blob_data.loc_oflags=LOC_WONLY;
Ifx_blob->BLOB.blob_data.loc_size=-1;
}
- return php3_list_insert(Ifx_blob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+ return php3_list_insert(Ifx_blob,IFXG(le_idresult));
}
@@ -3512,7 +3498,7 @@
int type;
Ifx_blob_orig = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || !(Ifx_blob_orig->type==TYPE_BLBYTE ||
Ifx_blob_orig->type==TYPE_BLTEXT)) {
+ if (type!=IFXG(le_idresult) || !(Ifx_blob_orig->type==TYPE_BLBYTE ||
Ifx_blob_orig->type==TYPE_BLTEXT)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return -1;
@@ -3564,7 +3550,7 @@
locator->loc_oflags=locator_orig->loc_oflags;
}
- return php3_list_insert(Ifx_blob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+ return php3_list_insert(Ifx_blob,IFXG(le_idresult));
}
@@ -3614,7 +3600,7 @@
int type;
Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT
|| Ifx_blob->type==TYPE_BLBYTE)) {
+ if (type!=IFXG(le_idresult) && !(Ifx_blob->type==TYPE_BLTEXT ||
Ifx_blob->type==TYPE_BLBYTE)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return -1;
@@ -3656,7 +3642,7 @@
int type;
Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT
|| Ifx_blob->type==TYPE_BLBYTE)) {
+ if (type!=IFXG(le_idresult) && !(Ifx_blob->type==TYPE_BLTEXT ||
Ifx_blob->type==TYPE_BLBYTE)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return -1;
@@ -3731,7 +3717,7 @@
int type;
Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT
|| Ifx_blob->type==TYPE_BLBYTE)) {
+ if (type!=IFXG(le_idresult) && !(Ifx_blob->type==TYPE_BLTEXT ||
Ifx_blob->type==TYPE_BLBYTE)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return -1;
@@ -3761,7 +3747,7 @@
int type;
Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT
|| Ifx_blob->type==TYPE_BLBYTE)) {
+ if (type!=IFXG(le_idresult) && !(Ifx_blob->type==TYPE_BLTEXT ||
Ifx_blob->type==TYPE_BLBYTE)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return NULL;
@@ -3824,7 +3810,7 @@
int type;
Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT
|| Ifx_blob->type==TYPE_BLBYTE)) {
+ if (type!=IFXG(le_idresult) && !(Ifx_blob->type==TYPE_BLTEXT ||
Ifx_blob->type==TYPE_BLBYTE)) {
php3_error(E_WARNING,"%d is not a Informix blob-result index",
bid);
return -1;
@@ -3923,7 +3909,7 @@
}
convert_to_long(pmode);
- Informix_GLOBAL(php3_ifx_module).blobinfile=pmode->value.lval;
+ IFXG(blobinfile)=pmode->value.lval;
RETURN_TRUE;
}
/* }}} */
@@ -3951,7 +3937,7 @@
}
convert_to_long(pmode);
- Informix_GLOBAL(php3_ifx_module).textasvarchar=pmode->value.lval;
+ IFXG(textasvarchar)=pmode->value.lval;
RETURN_TRUE;
}
/* }}} */
@@ -3978,7 +3964,7 @@
}
convert_to_long(pmode);
- Informix_GLOBAL(php3_ifx_module).byteasvarchar=pmode->value.lval;
+ IFXG(byteasvarchar)=pmode->value.lval;
RETURN_TRUE;
}
@@ -4005,7 +3991,7 @@
}
convert_to_long(pmode);
- Informix_GLOBAL(php3_ifx_module).nullformat=pmode->value.lval;
+ IFXG(nullformat)=pmode->value.lval;
RETURN_TRUE;
}
/* }}} */
@@ -4021,10 +4007,10 @@
static char* php3_intifx_null() {
char* tmp;
- if(Informix_GLOBAL(php3_ifx_module).nullformat==0) {
- tmp=Informix_GLOBAL(php3_ifx_module).nullvalue;
+ if(IFXG(nullformat)==0) {
+ tmp=IFXG(nullvalue);
} else {
- tmp=Informix_GLOBAL(php3_ifx_module).nullstring;
+ tmp=IFXG(nullstring);
}
return tmp;
}
@@ -4107,7 +4093,7 @@
Ifx_char->CHAR.char_data[len]=0;
Ifx_char->CHAR.len=len;
}
- return php3_list_insert(Ifx_char,Informix_GLOBAL(php3_ifx_module).le_idresult);
+ return php3_list_insert(Ifx_char,IFXG(le_idresult));
}
/* ----------------------------------------------------------------------
@@ -4158,7 +4144,7 @@
int type;
Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR))
{
+ if (type!=IFXG(le_idresult) && !(Ifx_char->type==TYPE_CHAR)) {
php3_error(E_WARNING,"%d is not a Informix char-result index",
bid);
return -1;
@@ -4212,7 +4198,7 @@
int type;
Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR))
{
+ if (type!=IFXG(le_idresult) && !(Ifx_char->type==TYPE_CHAR)) {
php3_error(E_WARNING,"%d is not a Informix char-result index",
bid);
return -1;
@@ -4279,7 +4265,7 @@
int type;
Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR))
{
+ if (type!=IFXG(le_idresult) && !(Ifx_char->type==TYPE_CHAR)) {
php3_error(E_WARNING,"%d is not a Informix char-result index",
bid);
return -1;
@@ -4424,7 +4410,7 @@
return -1;
}
- return php3_list_insert(Ifx_slob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+ return php3_list_insert(Ifx_slob,IFXG(le_idresult));
}
@@ -4473,7 +4459,7 @@
int type;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
return -1;
@@ -4539,7 +4525,7 @@
int type;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
return -1;
@@ -4624,7 +4610,7 @@
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
return -1;
@@ -4673,7 +4659,7 @@
Ifx_slob->type=TYPE_SLOB;
Ifx_slob->SLOB.lofd=-1;
Ifx_slob->SLOB.createspec=NULL;
- return php3_list_insert(Ifx_slob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+ return php3_list_insert(Ifx_slob,IFXG(le_idresult));
}
@@ -4692,7 +4678,7 @@
int errcode, type;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
return NULL;
@@ -4732,7 +4718,7 @@
convert_to_long(pbid);
bid=pbid->value.lval;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
RETURN_FALSE;
@@ -4782,7 +4768,7 @@
bid=pbid->value.lval;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
RETURN_FALSE;
@@ -4841,7 +4827,7 @@
bid=pbid->value.lval;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
RETURN_FALSE;
@@ -4892,7 +4878,7 @@
bid=pbid->value.lval;
Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
- if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+ if (type!=IFXG(le_idresult) || Ifx_slob->type!=TYPE_SLOB) {
php3_error(E_WARNING,"%d is not a Informix slob-result index",
bid);
RETURN_FALSE;
Index: php4/ext/informix/php_informix.h
diff -u php4/ext/informix/php_informix.h:1.2 php4/ext/informix/php_informix.h:1.3
--- php4/ext/informix/php_informix.h:1.2 Wed Jun 9 03:44:51 1999
+++ php4/ext/informix/php_informix.h Wed Jul 21 08:48:34 1999
@@ -40,22 +40,36 @@
#define HAVE_IFX 1
#endif
-#if HAVE_IFX
+#if WIN32||WINNT
+#define PHP_IFX_API __declspec(dllexport)
+#else
+#define PHP_IFX_API
+#endif
+
+
+#if HAVE_IFX /* with Informix */
+
#ifndef DLEXPORT
#define DLEXPORT
#endif
-
-#include "locator.h"
-#include "sqltypes.h"
+#ifdef ZTS
+#include "TSRM.h"
+#endif
extern php3_module_entry ifx_module_entry;
#define ifx_module_ptr &ifx_module_entry
+
+#include "locator.h"
+#include "sqltypes.h"
+
+/* user functions */
extern int php3_minit_ifx(INIT_FUNC_ARGS);
extern int php3_rinit_ifx(INIT_FUNC_ARGS);
extern int php3_mshutdown_ifx(SHUTDOWN_FUNC_ARGS);
void php3_info_ifx(ZEND_MODULE_INFO_FUNC_ARGS);
+/* functions common to all Informix versions */
PHP_FUNCTION(ifx_connect);
PHP_FUNCTION(ifx_pconnect);
PHP_FUNCTION(ifx_close);
@@ -73,7 +87,7 @@
PHP_FUNCTION(ifx_fieldtypes);
PHP_FUNCTION(ifx_fieldproperties);
PHP_FUNCTION(ifx_getsqlca);
-
+/* BLOB related stuff, IDS & IUS only */
PHP_FUNCTION(ifx_create_blob);
PHP_FUNCTION(ifx_free_blob) ;
PHP_FUNCTION(ifx_get_blob);
@@ -83,13 +97,12 @@
PHP_FUNCTION(ifx_textasvarchar);
PHP_FUNCTION(ifx_byteasvarchar);
PHP_FUNCTION(ifx_nullformat);
-
PHP_FUNCTION(ifx_create_char);
PHP_FUNCTION(ifx_free_char) ;
PHP_FUNCTION(ifx_update_char);
PHP_FUNCTION(ifx_get_char);
-
+/* SLOB, CLOB : IUS only functions */
#if HAVE_IFX_IUS
PHP_FUNCTION(ifxus_create_slob);
PHP_FUNCTION(ifxus_free_slob) ;
@@ -118,11 +131,36 @@
long nullformat; /* 0=NULL as "", 1= NULL as "NULL" */
char *nullvalue; /* "" */
char *nullstring; /* "NULL" */
-} ifx_module;
+} php_ifx_globals; /* formerly "ifx_module" in the php3 version */
+
+#ifndef ZTS
+extern php_ifx_globals ifx_globals;
+#endif
+
+#ifdef ZTS
+# define IFXLS_D php_ifx_globals *ifx_globals
+# define IFXLS_DC , IFXLS_D
+# define IFXLS_C ifx_globals
+# define IFXLS_CC , IFXLS_C
+# define IFXG(v) (ifx_globals->v)
+# define IFXLS_FETCH() php_ifx_globals *ifx_globals = ts_resource(ifx_globals_id)
+# define IFX_TLS_VARS char *globals; IFXLS_FETCH(); globals = (char *)ifx_globals;
+#else
+# define IFXLS_D
+# define IFXLS_DC
+# define IFXLS_C
+# define IFXLS_CC
+# define IFXG(v) (ifx_globals.v)
+# define IFXLS_FETCH()
+# define IFX_TLS_VARS char *globals = (char *)&ifx_globals
+extern ZEND_API php_ifx_globals ifx_globals;
+#endif
+
#define MAX_RESID 64
#define BLOBINFILE 0 /* 0=in memory, 1=in file */
+/* query result set data */
typedef struct ifx_res {
char connecid[16];
char cursorid[16];
@@ -173,19 +211,13 @@
#define SLOB DATARES.SLOBRES
#endif
-
+#else /* not HAVE_IFX */
-
-
-#ifndef THREAD_SAFE
-extern ifx_module php3_ifx_module;
-#endif
-
-#else
-
#define ifx_module_ptr NULL
#endif
+
+#define phpext_informix_ptr ifx_module_ptr
#endif /* _PHP3_IFX_H */