cvs: php4 /ext/icap php_icap.c

derick Fri Jun 28 06:51:46 2002 EDT Modified files: /php4/ext/icap php_icap.c Log: Unify error messages Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.35 php4/ext/icap/php_icap.c:1.36 --- php4/ext/icap/php_icap.c:1.35 Thu Feb 28 03:26:15 2002 +++ php4/ext/icap/php_icap.c Fri Jun 28 06:51:45 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_icap.c,v 1.35 2002/02/28 08:26:15 sebastian Exp $ */ +/* $Id: php_icap.c,v 1.36 2002/06/28 10:51:45 derick Exp $ */ #define ICAP1 @@ -187,7 +187,7 @@ } icap_stream = cal_open(NULL, Z_STRVAL_P(calendar), 0); if (!icap_stream) { - php_error(E_WARNING, "Couldn't open stream %s\n", Z_STRVAL_P(calendar)); + php_error(E_WARNING, "%s(): Couldn't open stream %s", get_active_function_name(TSRMLS_C), Z_STRVAL_P(calendar)); RETURN_FALSE; } @@ -216,7 +216,7 @@ ind = Z_LVAL_P(streamind); icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } if(myargcount==2) { @@ -261,7 +261,7 @@ ind = Z_LVAL_P(streamind); icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -276,7 +276,7 @@ cal_login(icap_stream, Z_STRVAL_P(calendar)); */ if (icap_stream == NULL) { - php_error(E_WARNING, "Couldn't re-open stream\n"); + php_error(E_WARNING, "%s(): Couldn't re-open stream", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } RETURN_TRUE; @@ -304,7 +304,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -332,7 +332,7 @@ ind = Z_LVAL_P(streamind); icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } if(myargcount==3) { @@ -410,7 +410,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -488,7 +488,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } /* @@ -524,7 +524,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } /* @@ -562,7 +562,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -632,7 +632,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -667,7 +667,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } if (cal_remove(icap_le_struct->icap_stream, Z_LVAL_P(uid))) @@ -724,7 +724,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -869,7 +869,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "%s(): Unable to find stream pointer", get_active_function_name(TSRMLS_C)); RETURN_FALSE; }