cvs: php4 /ext/msession msession.c
| From: | Derick Rethans | Date: | Wed, 26 Jun 2002 08:48:54 +0000 |
| Subject: | cvs: php4 /ext/msession msession.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12542@lists.php.net to get a copy of this message | ||
derick Wed Jun 26 04:48:54 2002 EDT
Modified files:
/php4/ext/msession msession.c
Log:
Unify error messages
Index: php4/ext/msession/msession.c
diff -u php4/ext/msession/msession.c:1.34 php4/ext/msession/msession.c:1.35
--- php4/ext/msession/msession.c:1.34 Tue Jun 4 09:59:39 2002
+++ php4/ext/msession/msession.c Wed Jun 26 04:48:54 2002
@@ -59,8 +59,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); return V; }
-#define IFCONNECT_END } else { php_error(E_WARNING, s_szNoInit); RETURN_FALSE; }
+#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; }
#ifndef HAVE_PHP_SESSION
#error HAVE_PHP_SESSION not defined
@@ -117,8 +117,8 @@
#endif
/* Static strings */
-static char s_szNoInit[]="Msession not initialized";
-static char s_szErrFmt[]="MSession Error :%s";
+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";
@@ -354,7 +354,7 @@
PHPDoRequest(&s_conn,&s_reqb);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
return ret;
@@ -369,7 +369,7 @@
PHPDoRequest(&s_conn,&s_reqb);
ret = (s_reqb->req.stat==REQ_OK);
if(s_reqb->req.stat!=REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
return ret;
IFCONNECT_ENDVAL(0)
@@ -402,7 +402,7 @@
}
else
{
- php_error(E_WARNING, "MSession connect failed");
+ php_error(E_WARNING, "%s(): MSession connect failed",
get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
}
@@ -458,7 +458,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -506,7 +506,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -614,7 +614,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -655,7 +655,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -695,7 +695,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -728,7 +728,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -761,7 +761,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -807,7 +807,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -840,7 +840,7 @@
{
// May this should be an error?
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -891,7 +891,7 @@
else
{
if(s_reqb->req.param != REQE_NOSESSION)
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -977,7 +977,7 @@
PHPDoRequest(&s_conn,&s_reqb);
if(s_reqb->req.stat != REQ_OK)
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
efree((void *)pairs);
IFCONNECT_END
}
@@ -1024,7 +1024,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1065,7 +1065,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_NULL();
}
IFCONNECT_END
@@ -1098,7 +1098,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1203,7 +1203,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
@@ -1253,7 +1253,7 @@
}
else if(s_reqb->req.stat != REQ_OK)
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
RETURN_FALSE;
}
IFCONNECT_END
@@ -1347,7 +1347,7 @@
}
else
{
- php_error(E_WARNING, s_szErrFmt, ReqbErr(s_reqb));
+ php_error(E_WARNING, s_szErrFmt, get_active_function_name(TSRMLS_C), ReqbErr(s_reqb));
}
}
ELOG("Yikes, could not get sid from msession");