cvs: php4 /ext/yp yp.c /ext/zip zip.c

iliaa Sat Jan 18 14:20:03 2003 EDT Modified files: /php4/ext/yp yp.c /php4/ext/zip zip.c Log: Changed php_error to php_error_docref. Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.32 php4/ext/yp/yp.c:1.33 --- php4/ext/yp/yp.c:1.32 Tue Dec 31 11:08:12 2002 +++ php4/ext/yp/yp.c Sat Jan 18 14:20:00 2003 @@ -16,7 +16,7 @@ | Fredrik Ohrn | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.32 2002/12/31 16:08:12 sebastian Exp $ */ +/* $Id: yp.c,v 1.33 2003/01/18 19:20:00 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,7 +79,7 @@ char *outdomain; if((YP(error) = yp_get_default_domain(&outdomain))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } RETVAL_STRING(outdomain,1); @@ -106,7 +106,7 @@ convert_to_string_ex(map); if((YP(error) = yp_order(Z_STRVAL_PP (domain), Z_STRVAL_PP (map), &outval))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } @@ -129,7 +129,7 @@ convert_to_string_ex(map); if((YP(error) = yp_master(Z_STRVAL_PP (domain), Z_STRVAL_PP (map), &outname))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } @@ -154,7 +154,7 @@ convert_to_string_ex(key); if((YP(error) = yp_match(Z_STRVAL_PP (domain), Z_STRVAL_PP (map), Z_STRVAL_PP (key), Z_STRLEN_PP (key), &outval, &outvallen))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } @@ -178,7 +178,7 @@ convert_to_string_ex(map); if((YP(error) = yp_first(Z_STRVAL_PP (domain), Z_STRVAL_PP (map), &outkey, &outkeylen, &outval, &outvallen))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } array_init(return_value); @@ -207,7 +207,7 @@ convert_to_string_ex(key); if((YP(error) = yp_next(Z_STRVAL_PP (domain), Z_STRVAL_PP (map), Z_STRVAL_PP (key), Z_STRLEN_PP (key), &outkey, &outkeylen, &outval, &outvallen))) { - php_error(E_WARNING, yperr_string (YP(error))); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (YP(error))); RETURN_FALSE; } @@ -302,7 +302,7 @@ TSRMLS_FETCH(); YP(error) = err; - php_error(E_WARNING, yperr_string (err)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", yperr_string (err)); } return 0; Index: php4/ext/zip/zip.c diff -u php4/ext/zip/zip.c:1.34 php4/ext/zip/zip.c:1.35 --- php4/ext/zip/zip.c:1.34 Tue Dec 31 11:08:13 2002 +++ php4/ext/zip/zip.c Sat Jan 18 14:20:02 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zip.c,v 1.34 2002/12/31 16:08:13 sebastian Exp $ */ +/* $Id: zip.c,v 1.35 2003/01/18 19:20:02 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -142,8 +142,7 @@ archive_p = zzip_opendir(filename); if (archive_p == NULL) { - php_error(E_WARNING, "%s() Cannot open zip archive %s", - get_active_function_name(TSRMLS_C), filename); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot open zip archive %s", filename); RETURN_FALSE; }