iliaa Mon Jan 20 11:15:18 2003 EDT
Modified files:
/php4/ext/msession msession.c
Log:
Restore php_error -> php_error_docref patch.
Index: php4/ext/msession/msession.c
diff -u php4/ext/msession/msession.c:1.40 php4/ext/msession/msession.c:1.41
--- php4/ext/msession/msession.c:1.40 Sun Jan 19 22:16:22 2003
+++ php4/ext/msession/msession.c Mon Jan 20 11:15:16 2003
@@ -53,8 +53,8 @@
/* Test if system is OK fror use. */
/* Macros may be ugly, but I can globaly add debuging when needed. */
#define IFCONNECT_BEGIN if(s_reqb && s_conn) {
-#define IFCONNECT_ENDVAL(V) } else { php_error(E_WARNING, s_szNoInit,
get_active_function_name(TSRMLS_C)); return V; }
-#define IFCONNECT_END } else { php_error(E_WARNING, s_szNoInit,
get_active_function_name(TSRMLS_C)); RETURN_FALSE; }
+#define IFCONNECT_ENDVAL(V) } else { php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"Msession not initialized"); return V; }
+#define IFCONNECT_END } else { php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"Msession not initialized"); RETURN_FALSE; }
#ifndef HAVE_PHP_SESSION
#error HAVE_PHP_SESSION not defined
@@ -113,10 +113,6 @@
#endif
#endif
-/* Static strings */
-static char s_szNoInit[]="%s(): Msession not initialized";
-static char s_szErrFmt[]="%s(): %s";
-
/* Per-process variables need by msession */
static char s_szdefhost[]="localhost";
static char * s_szhost=s_szdefhost;
@@ -280,8 +276,6 @@
int PHPMsessionConnect(const char *szhost, int nport)
{
int fNewHost=FALSE;
-
- TSRMLS_FETCH();
if(!s_reqb)
s_reqb = AllocateRequestBuffer(2048);
@@ -358,7 +352,7 @@
PHPExecRequest(REQ_DATASET, session,"",data,0);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
return ret;
@@ -373,7 +367,7 @@
PHPExecRequest( REQ_DROP, session, "","",0);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
return ret;
IFCONNECT_ENDVAL(0)
@@ -406,7 +400,7 @@
}
else
{
- php_error(E_WARNING, "%s(): MSession connect failed",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "MSession connect failed");
RETURN_FALSE;
}
}
@@ -460,7 +454,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -507,7 +501,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -615,7 +609,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -655,7 +649,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -694,7 +688,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -726,7 +720,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -758,7 +752,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -803,7 +797,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -835,7 +829,7 @@
{
/* May this should be an error? */
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt,
get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -885,7 +879,7 @@
else
{
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt,
get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -926,12 +920,6 @@
pairs = (char **)emalloc(sizeof(char *) * countpair * 2);
- if(!pairs)
- {
- ELOG("no pairs");
- RETURN_FALSE;
- }
-
ELOG("have pairs");
/* Initializes pos */
@@ -969,7 +957,7 @@
PHPExecRequestMulti(REQ_SETVAL, Z_STRVAL_PP(session), countpair, pairs,0);
if(s_reqb->req.stat != REQ_OK)
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
efree((void *)pairs);
IFCONNECT_END
}
@@ -1015,7 +1003,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1055,7 +1043,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1087,7 +1075,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1191,7 +1179,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -1240,7 +1228,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1269,7 +1257,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1289,7 +1277,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C),
ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1384,7 +1372,7 @@
else
{
ELOG("Reports that UNIQ failed");
- php_error(E_WARNING, s_szErrFmt,
get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb));
}
}
ELOG("Yikes, could not get sid from msession 2003");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
