cvs: php4 /ext/msession msession.c reqclient.h
| From: | Mark L. Woodward | Date: | Mon, 15 Apr 2002 22:00:57 +0000 |
| Subject: | cvs: php4 /ext/msession msession.c reqclient.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11150@lists.php.net to get a copy of this message | ||
mlwmohawk Mon Apr 15 18:00:57 2002 EDT
Modified files:
/php4/ext/msession msession.c reqclient.h
Log:
Chages for beta3
Index: php4/ext/msession/msession.c
diff -u php4/ext/msession/msession.c:1.32 php4/ext/msession/msession.c:1.33
--- php4/ext/msession/msession.c:1.32 Mon Apr 8 19:07:20 2002
+++ php4/ext/msession/msession.c Mon Apr 15 18:00:54 2002
@@ -281,7 +281,7 @@
DoRequest(s_conn,&s_reqb);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
return ret;
@@ -297,7 +297,7 @@
DoRequest(s_conn,&s_reqb);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
return ret;
IFCONNECT_ENDVAL(0)
@@ -386,7 +386,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -434,7 +434,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -542,7 +542,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -583,7 +583,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -623,7 +623,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -656,7 +656,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -689,7 +689,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -735,7 +735,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -768,7 +768,7 @@
{
// May this should be an error?
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -819,7 +819,7 @@
else
{
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -905,7 +905,7 @@
DoRequest(s_conn,&s_reqb);
if(s_reqb->req.stat != REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
efree((void *)pairs);
IFCONNECT_END
}
@@ -952,7 +952,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -993,7 +993,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1026,7 +1026,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1131,7 +1131,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -1181,7 +1181,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1256,7 +1256,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqErr(s_reqb->req.param));
+ php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
}
}
ELOG("Yikes, could not get sid from msession");
Index: php4/ext/msession/reqclient.h
diff -u php4/ext/msession/reqclient.h:1.8 php4/ext/msession/reqclient.h:1.9
--- php4/ext/msession/reqclient.h:1.8 Mon Apr 8 19:07:22 2002
+++ php4/ext/msession/reqclient.h Mon Apr 15 18:00:55 2002
@@ -137,7 +137,7 @@
void *OpenReqConn(char *hostname, int port);
void CloseReqConn(void *conn);
int DoRequest(void *conn, REQB **preq);
-char *ReqErr(int param);
+char *ReqbErr(REQB *reqb);
#define ASSERT_STAT(PREQ) if(PREQ->stat != REQ_OK) \
{fprintf(stderr, "Error in Request %s %d %s\n", \