cvs: php4 /ext/pdf pdf.c /ext/readline readline.c /ext/standard basic_functions.c /ext/xslt sablot.c /main php.h
| From: | Hartmut Holzgraefe | Date: | Fri, 22 Mar 2002 01:10:32 +0000 |
| Subject: | cvs: php4 /ext/pdf pdf.c /ext/readline readline.c /ext/standard basic_functions.c /ext/xslt sablot.c /main php.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10569@lists.php.net to get a copy of this message | ||
hholzgra Thu Mar 21 20:10:32 2002 EDT
Modified files:
/php4/ext/pdf pdf.c
/php4/ext/readline readline.c
/php4/ext/standard basic_functions.c
/php4/main php.h
/php4/ext/xslt sablot.c
Log:
getting rid of the warn_not_available alias
Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.109 php4/ext/pdf/pdf.c:1.110 --- php4/ext/pdf/pdf.c:1.109 Thu Mar 21 17:34:56 2002 +++ php4/ext/pdf/pdf.c Thu Mar 21 20:10:30 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.109 2002/03/21 22:34:56 mfischer Exp $ */ +/* $Id: pdf.c,v 1.110 2002/03/22 01:10:30 hholzgra Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -182,8 +182,6 @@ PHP_FE(pdf_add_annotation, NULL) #if HAVE_LIBGD13 PHP_FE(pdf_open_memory_image, NULL) -#else - PHP_FALIAS(pdf_open_memory_image, warn_not_available, NULL) #endif /* depreciatet after V4.0 of PDFlib */ PHP_FE(pdf_setgray_fill, NULL) @@ -212,24 +210,6 @@ PHP_FE(pdf_add_thumbnail, NULL) PHP_FE(pdf_initgraphics, NULL) PHP_FE(pdf_setmatrix, NULL) -#else - PHP_FALIAS(pdf_open_pdi, warn_not_available, NULL) - PHP_FALIAS(pdf_close_pdi, warn_not_available, NULL) - PHP_FALIAS(pdf_open_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_place_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_close_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_get_pdi_parameter, warn_not_available, NULL) - PHP_FALIAS(pdf_get_pdi_value, warn_not_available, NULL) - PHP_FALIAS(pdf_begin_pattern, warn_not_available, NULL) - PHP_FALIAS(pdf_end_pattern, warn_not_available, NULL) - PHP_FALIAS(pdf_begin_template, warn_not_available, NULL) - PHP_FALIAS(pdf_end_template, warn_not_available, NULL) - PHP_FALIAS(pdf_setcolor, warn_not_available, NULL) - PHP_FALIAS(pdf_makespotcolor, warn_not_available, NULL) - PHP_FALIAS(pdf_arcn, warn_not_available, NULL) - PHP_FALIAS(pdf_add_thumbnail, warn_not_available, NULL) - PHP_FALIAS(pdf_initgraphics, warn_not_available, NULL) - PHP_FALIAS(pdf_setmatrix, warn_not_available, NULL) #endif /* PDFlib >= V4 */ {NULL, NULL, NULL} @@ -348,7 +328,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.109 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.110 $" ); php_info_print_table_end(); } Index: php4/ext/readline/readline.c diff -u php4/ext/readline/readline.c:1.28 php4/ext/readline/readline.c:1.29 --- php4/ext/readline/readline.c:1.28 Thu Feb 28 03:26:39 2002 +++ php4/ext/readline/readline.c Thu Mar 21 20:10:30 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.28 2002/02/28 08:26:39 sebastian Exp $ */ +/* $Id: readline.c,v 1.29 2002/03/22 01:10:30 hholzgra Exp $ */ /* {{{ includes & prototypes */ @@ -59,8 +59,6 @@ PHP_FE(readline_clear_history, NULL) #ifdef HAVE_LIBREADLINE PHP_FE(readline_list_history, NULL) -#else - PHP_FALIAS(readline_list_history, warn_not_available, NULL) #endif PHP_FE(readline_read_history, NULL) PHP_FE(readline_write_history, NULL) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.463 php4/ext/standard/basic_functions.c:1.464 --- php4/ext/standard/basic_functions.c:1.463 Thu Mar 21 14:18:11 2002 +++ php4/ext/standard/basic_functions.c Thu Mar 21 20:10:31 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.463 2002/03/21 19:18:11 hholzgra Exp $ */ +/* $Id: basic_functions.c,v 1.464 2002/03/22 01:10:31 hholzgra Exp $ */ #include "php.h" #include "php_streams.h" @@ -259,9 +259,6 @@ #if HAVE_STRFTIME PHP_FE(strftime, NULL) PHP_FE(gmstrftime, NULL) -#else - PHP_FALIAS(strftime, warn_not_available, NULL) - PHP_FALIAS(gmstrftime, warn_not_available, NULL) #endif PHP_FE(strtotime, NULL) @@ -318,8 +315,6 @@ #ifdef HAVE_STRCOLL PHP_FE(strcoll, NULL) -#else - PHP_FALIAS(strcoll, warn_not_available, NULL) #endif PHP_FE(substr, NULL) @@ -346,8 +341,6 @@ #if HAVE_NL_LANGINFO PHP_FE(nl_langinfo, NULL) -#else - PHP_FALIAS(nl_langinfo, warn_not_available, NULL) #endif PHP_FE(soundex, NULL) @@ -375,11 +368,6 @@ PHP_FE(linkinfo, NULL) PHP_FE(symlink, NULL) PHP_FE(link, NULL) -#else - PHP_FALIAS(readlink, warn_not_available, NULL) - PHP_FALIAS(linkinfo, warn_not_available, NULL) - PHP_FALIAS(symlink, warn_not_available, NULL) - PHP_FALIAS(link, warn_not_available, NULL) #endif PHP_FE(unlink, NULL) @@ -420,9 +408,6 @@ #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32)) PHP_FE(checkdnsrr, NULL) PHP_FE(getmxrr,second_and_third_args_force_ref) -#else - PHP_FALIAS(checkdnsrr, warn_not_available, NULL) - PHP_FALIAS(getmxrr, warn_not_available, NULL) #endif PHP_FE(getmyuid, NULL) @@ -484,8 +469,6 @@ PHP_FE(getenv, NULL) #ifdef HAVE_PUTENV PHP_FE(putenv, NULL) -#else - PHP_FALIAS(putenv,warn_not_available, NULL) #endif PHP_FE(microtime, NULL) @@ -493,8 +476,6 @@ #ifdef HAVE_GETRUSAGE PHP_FE(getrusage, NULL) -#else - PHP_FALIAS(getrusage, warn_not_available, NULL) #endif PHP_FE(uniqid, NULL) @@ -628,22 +609,16 @@ #if HAVE_SYS_TIME_H PHP_FE(socket_set_timeout, NULL) -#else - PHP_FALIAS(socket_set_timeout, warn_not_available, NULL) #endif PHP_FE(socket_get_status, NULL) #if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FE(realpath, NULL) -#else - PHP_FALIAS(realpath, warn_not_available, NULL) #endif #ifdef HAVE_FNMATCH PHP_FE(fnmatch, NULL) -#else - PHP_FALIAS(fnmatch, warn_not_available, NULL) #endif /* functions from fsock.c */ @@ -660,8 +635,6 @@ #if HAVE_CRYPT /* functions from crypt.c */ PHP_FE(crypt, NULL) -#else - PHP_FALIAS(crypt, warn_not_available, NULL) #endif /* functions from dir.c */ @@ -671,8 +644,6 @@ #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC PHP_FE(chroot, NULL) -#else - PHP_FALIAS(chroot, warn_not_available, NULL) #endif PHP_FE(getcwd, NULL) @@ -681,8 +652,6 @@ PHP_FALIAS(dir, getdir, NULL) #ifdef HAVE_GLOB PHP_FE(glob, NULL) -#else - PHP_FALIAS(glob, warn_not_available, NULL) #endif /* functions from filestat.c */ PHP_FE(fileatime, NULL) @@ -717,9 +686,6 @@ #ifdef HAVE_SENDMAIL PHP_FE(mail, NULL) PHP_FE(ezmlm_hash, NULL) -#else - PHP_FALIAS(mail, warn_not_available, NULL) - PHP_FALIAS(ezmlm_hash, warn_not_available, NULL) #endif /* functions from syslog.c */ @@ -819,8 +785,6 @@ /* functions from ftok.c*/ #if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP PHP_FE(ftok, NULL) -#else - PHP_FALIAS(ftok , warn_not_available, NULL) #endif PHP_FE(str_rot13, NULL) @@ -2315,13 +2279,6 @@ efree(tick_fe.arguments); } /* }}} */ - -/* This function is not directly accessible to end users */ -PHPAPI PHP_FUNCTION(warn_not_available) -{ - php_error(E_WARNING, "%s() is not supported in this PHP build", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; -} /* {{{ proto bool is_uploaded_file(string path) Check if file was created by rfc1867 upload */ Index: php4/main/php.h diff -u php4/main/php.h:1.166 php4/main/php.h:1.167 --- php4/main/php.h:1.166 Mon Mar 18 03:29:17 2002 +++ php4/main/php.h Thu Mar 21 20:10:31 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.166 2002/03/18 08:29:17 sas Exp $ */ +/* $Id: php.h,v 1.167 2002/03/22 01:10:31 hholzgra Exp $ */ #ifndef PHP_H #define PHP_H @@ -358,8 +358,6 @@ #define XtOffsetOf(s_type, field) XtOffset(s_type*, field) #endif #endif /* !XtOffsetOf */ - -PHPAPI PHP_FUNCTION(warn_not_available); #endif Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.34 php4/ext/xslt/sablot.c:1.35 --- php4/ext/xslt/sablot.c:1.34 Thu Feb 28 03:27:00 2002 +++ php4/ext/xslt/sablot.c Thu Mar 21 20:10:31 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.34 2002/02/28 08:27:00 sebastian Exp $ */ +/* $Id: sablot.c,v 1.35 2002/03/22 01:10:31 hholzgra Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -81,8 +81,6 @@ PHP_FE(xslt_set_base, NULL) #ifdef HAVE_SABLOT_SET_ENCODING PHP_FE(xslt_set_encoding, NULL) -#else - PHP_FALIAS(xslt_set_encoding, warn_not_available, NULL) #endif PHP_FE(xslt_set_log, NULL) PHP_FE(xslt_process, NULL)
Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.109 php4/ext/pdf/pdf.c:1.110 --- php4/ext/pdf/pdf.c:1.109 Thu Mar 21 17:34:56 2002 +++ php4/ext/pdf/pdf.c Thu Mar 21 20:10:30 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.109 2002/03/21 22:34:56 mfischer Exp $ */ +/* $Id: pdf.c,v 1.110 2002/03/22 01:10:30 hholzgra Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -182,8 +182,6 @@ PHP_FE(pdf_add_annotation, NULL) #if HAVE_LIBGD13 PHP_FE(pdf_open_memory_image, NULL) -#else - PHP_FALIAS(pdf_open_memory_image, warn_not_available, NULL) #endif /* depreciatet after V4.0 of PDFlib */ PHP_FE(pdf_setgray_fill, NULL) @@ -212,24 +210,6 @@ PHP_FE(pdf_add_thumbnail, NULL) PHP_FE(pdf_initgraphics, NULL) PHP_FE(pdf_setmatrix, NULL) -#else - PHP_FALIAS(pdf_open_pdi, warn_not_available, NULL) - PHP_FALIAS(pdf_close_pdi, warn_not_available, NULL) - PHP_FALIAS(pdf_open_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_place_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_close_pdi_page, warn_not_available, NULL) - PHP_FALIAS(pdf_get_pdi_parameter, warn_not_available, NULL) - PHP_FALIAS(pdf_get_pdi_value, warn_not_available, NULL) - PHP_FALIAS(pdf_begin_pattern, warn_not_available, NULL) - PHP_FALIAS(pdf_end_pattern, warn_not_available, NULL) - PHP_FALIAS(pdf_begin_template, warn_not_available, NULL) - PHP_FALIAS(pdf_end_template, warn_not_available, NULL) - PHP_FALIAS(pdf_setcolor, warn_not_available, NULL) - PHP_FALIAS(pdf_makespotcolor, warn_not_available, NULL) - PHP_FALIAS(pdf_arcn, warn_not_available, NULL) - PHP_FALIAS(pdf_add_thumbnail, warn_not_available, NULL) - PHP_FALIAS(pdf_initgraphics, warn_not_available, NULL) - PHP_FALIAS(pdf_setmatrix, warn_not_available, NULL) #endif /* PDFlib >= V4 */ {NULL, NULL, NULL} @@ -348,7 +328,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.109 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.110 $" ); php_info_print_table_end(); } Index: php4/ext/readline/readline.c diff -u php4/ext/readline/readline.c:1.28 php4/ext/readline/readline.c:1.29 --- php4/ext/readline/readline.c:1.28 Thu Feb 28 03:26:39 2002 +++ php4/ext/readline/readline.c Thu Mar 21 20:10:30 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.28 2002/02/28 08:26:39 sebastian Exp $ */ +/* $Id: readline.c,v 1.29 2002/03/22 01:10:30 hholzgra Exp $ */ /* {{{ includes & prototypes */ @@ -59,8 +59,6 @@ PHP_FE(readline_clear_history, NULL) #ifdef HAVE_LIBREADLINE PHP_FE(readline_list_history, NULL) -#else - PHP_FALIAS(readline_list_history, warn_not_available, NULL) #endif PHP_FE(readline_read_history, NULL) PHP_FE(readline_write_history, NULL) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.463 php4/ext/standard/basic_functions.c:1.464 --- php4/ext/standard/basic_functions.c:1.463 Thu Mar 21 14:18:11 2002 +++ php4/ext/standard/basic_functions.c Thu Mar 21 20:10:31 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.463 2002/03/21 19:18:11 hholzgra Exp $ */ +/* $Id: basic_functions.c,v 1.464 2002/03/22 01:10:31 hholzgra Exp $ */ #include "php.h" #include "php_streams.h" @@ -259,9 +259,6 @@ #if HAVE_STRFTIME PHP_FE(strftime, NULL) PHP_FE(gmstrftime, NULL) -#else - PHP_FALIAS(strftime, warn_not_available, NULL) - PHP_FALIAS(gmstrftime, warn_not_available, NULL) #endif PHP_FE(strtotime, NULL) @@ -318,8 +315,6 @@ #ifdef HAVE_STRCOLL PHP_FE(strcoll, NULL) -#else - PHP_FALIAS(strcoll, warn_not_available, NULL) #endif PHP_FE(substr, NULL) @@ -346,8 +341,6 @@ #if HAVE_NL_LANGINFO PHP_FE(nl_langinfo, NULL) -#else - PHP_FALIAS(nl_langinfo, warn_not_available, NULL) #endif PHP_FE(soundex, NULL) @@ -375,11 +368,6 @@ PHP_FE(linkinfo, NULL) PHP_FE(symlink, NULL) PHP_FE(link, NULL) -#else - PHP_FALIAS(readlink, warn_not_available, NULL) - PHP_FALIAS(linkinfo, warn_not_available, NULL) - PHP_FALIAS(symlink, warn_not_available, NULL) - PHP_FALIAS(link, warn_not_available, NULL) #endif PHP_FE(unlink, NULL) @@ -420,9 +408,6 @@ #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32)) PHP_FE(checkdnsrr, NULL) PHP_FE(getmxrr,second_and_third_args_force_ref) -#else - PHP_FALIAS(checkdnsrr, warn_not_available, NULL) - PHP_FALIAS(getmxrr, warn_not_available, NULL) #endif PHP_FE(getmyuid, NULL) @@ -484,8 +469,6 @@ PHP_FE(getenv, NULL) #ifdef HAVE_PUTENV PHP_FE(putenv, NULL) -#else - PHP_FALIAS(putenv,warn_not_available, NULL) #endif PHP_FE(microtime, NULL) @@ -493,8 +476,6 @@ #ifdef HAVE_GETRUSAGE PHP_FE(getrusage, NULL) -#else - PHP_FALIAS(getrusage, warn_not_available, NULL) #endif PHP_FE(uniqid, NULL) @@ -628,22 +609,16 @@ #if HAVE_SYS_TIME_H PHP_FE(socket_set_timeout, NULL) -#else - PHP_FALIAS(socket_set_timeout, warn_not_available, NULL) #endif PHP_FE(socket_get_status, NULL) #if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FE(realpath, NULL) -#else - PHP_FALIAS(realpath, warn_not_available, NULL) #endif #ifdef HAVE_FNMATCH PHP_FE(fnmatch, NULL) -#else - PHP_FALIAS(fnmatch, warn_not_available, NULL) #endif /* functions from fsock.c */ @@ -660,8 +635,6 @@ #if HAVE_CRYPT /* functions from crypt.c */ PHP_FE(crypt, NULL) -#else - PHP_FALIAS(crypt, warn_not_available, NULL) #endif /* functions from dir.c */ @@ -671,8 +644,6 @@ #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC PHP_FE(chroot, NULL) -#else - PHP_FALIAS(chroot, warn_not_available, NULL) #endif PHP_FE(getcwd, NULL) @@ -681,8 +652,6 @@ PHP_FALIAS(dir, getdir, NULL) #ifdef HAVE_GLOB PHP_FE(glob, NULL) -#else - PHP_FALIAS(glob, warn_not_available, NULL) #endif /* functions from filestat.c */ PHP_FE(fileatime, NULL) @@ -717,9 +686,6 @@ #ifdef HAVE_SENDMAIL PHP_FE(mail, NULL) PHP_FE(ezmlm_hash, NULL) -#else - PHP_FALIAS(mail, warn_not_available, NULL) - PHP_FALIAS(ezmlm_hash, warn_not_available, NULL) #endif /* functions from syslog.c */ @@ -819,8 +785,6 @@ /* functions from ftok.c*/ #if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP PHP_FE(ftok, NULL) -#else - PHP_FALIAS(ftok , warn_not_available, NULL) #endif PHP_FE(str_rot13, NULL) @@ -2315,13 +2279,6 @@ efree(tick_fe.arguments); } /* }}} */ - -/* This function is not directly accessible to end users */ -PHPAPI PHP_FUNCTION(warn_not_available) -{ - php_error(E_WARNING, "%s() is not supported in this PHP build", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; -} /* {{{ proto bool is_uploaded_file(string path) Check if file was created by rfc1867 upload */ Index: php4/main/php.h diff -u php4/main/php.h:1.166 php4/main/php.h:1.167 --- php4/main/php.h:1.166 Mon Mar 18 03:29:17 2002 +++ php4/main/php.h Thu Mar 21 20:10:31 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.166 2002/03/18 08:29:17 sas Exp $ */ +/* $Id: php.h,v 1.167 2002/03/22 01:10:31 hholzgra Exp $ */ #ifndef PHP_H #define PHP_H @@ -358,8 +358,6 @@ #define XtOffsetOf(s_type, field) XtOffset(s_type*, field) #endif #endif /* !XtOffsetOf */ - -PHPAPI PHP_FUNCTION(warn_not_available); #endif Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.34 php4/ext/xslt/sablot.c:1.35 --- php4/ext/xslt/sablot.c:1.34 Thu Feb 28 03:27:00 2002 +++ php4/ext/xslt/sablot.c Thu Mar 21 20:10:31 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.34 2002/02/28 08:27:00 sebastian Exp $ */ +/* $Id: sablot.c,v 1.35 2002/03/22 01:10:31 hholzgra Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -81,8 +81,6 @@ PHP_FE(xslt_set_base, NULL) #ifdef HAVE_SABLOT_SET_ENCODING PHP_FE(xslt_set_encoding, NULL) -#else - PHP_FALIAS(xslt_set_encoding, warn_not_available, NULL) #endif PHP_FE(xslt_set_log, NULL) PHP_FE(xslt_process, NULL)