cvs: php4 /main main.c

helly Thu Aug 8 18:11:25 2002 EDT Modified files: /php4/main main.c Log: No missleading Index: php4/main/main.c diff -u php4/main/main.c:1.473 php4/main/main.c:1.474 --- php4/main/main.c:1.473 Thu Aug 8 15:36:49 2002 +++ php4/main/main.c Thu Aug 8 18:11:24 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.473 2002/08/08 19:36:49 helly Exp $ */ +/* $Id: main.c,v 1.474 2002/08/08 22:11:24 helly Exp $ */ /* {{{ includes */ @@ -402,8 +402,6 @@ 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) { @@ -412,8 +410,11 @@ } else { php_error(type, "%s(%s) [%s%s]: %s", get_active_function_name(TSRMLS_C), params, PG(docref_root), docref, buffer); } - } else { - php_error(type, "%s(%s): %s", get_active_function_name(TSRMLS_C), params, buffer); + } else { + docref = get_active_function_name(TSRMLS_C); + if (!docref) + docref = "Unknown"; + php_error(type, "%s(%s): %s", docref, params, buffer); } efree(buffer); if (docref_buf)