cvs: php4 /main main.c
| From: | Marcus B�rger | Date: | Thu, 08 Aug 2002 19:36:50 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13224@lists.php.net to get a copy of this message | ||
helly Thu Aug 8 15:36:50 2002 EDT
Modified files:
/php4/main main.c
Log:
Say FIXME to non function calls and non TSRM builds. Both will currentls
not show a default reference.
Index: php4/main/main.c
diff -u php4/main/main.c:1.472 php4/main/main.c:1.473
--- php4/main/main.c:1.472 Thu Aug 8 15:12:27 2002
+++ php4/main/main.c Thu Aug 8 15:36:49 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.472 2002/08/08 19:12:27 helly Exp $ */
+/* $Id: main.c,v 1.473 2002/08/08 19:36:49 helly Exp $ */
/* {{{ includes
*/
@@ -390,15 +390,20 @@
/* {{{ php_verror */
PHPAPI void php_verror(const char *docref, const char *params, int type, const char *format,
va_list args TSRMLS_DC)
{
- char *buffer = NULL, *docref_buf = NULL, *p;
+ char *buffer = NULL, *docref_buf = NULL, *function, *p;
vspprintf(&buffer, 0, format, args);
if (buffer) {
if (!docref) {
- spprintf(&docref_buf, 0, "function.%s%s", get_active_function_name(TSRMLS_C),
PG(docref_ext));
- if (docref_buf) {
- while((p=strchr(docref_buf, '_'))!=NULL) *p = '-';
- docref = docref_buf;
+ function = get_active_function_name(TSRMLS_C);
+ if (function) {
+ spprintf(&docref_buf, 0, "function.%s%s", function, PG(docref_ext));
+ if (docref_buf) {
+ while((p=strchr(docref_buf, '_'))!=NULL) *p = '-';
+ docref = docref_buf;
+ }
+ } else {
+ /* FIXME: need to handle non function calls and non TSRM builds here */
}
}
if (docref) {