rasmus Thu May 17 06:38:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c lcg.c php_ext_syslog.h
syslog.c
Log:
Get rid of a useless RINIT and an empty RSHUTDOWN on non-Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.50&r2=1.725.2.31.2.51&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.50
php-src/ext/standard/basic_functions.c:1.725.2.31.2.51
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.50 Thu May 10
16:28:11 2007
+++ php-src/ext/standard/basic_functions.c Thu May 17 06:38:13 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.50 2007/05/10 16:28:11 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.51 2007/05/17 06:38:13 rasmus Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4130,8 +4130,6 @@
#endif
BG(user_shutdown_function_names) = NULL;
- PHP_RINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
-
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU);
@@ -4186,9 +4184,11 @@
*/
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#ifdef PHP_WIN32
#ifdef HAVE_SYSLOG_H
PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
+#endif
PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(streams)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/lcg.c?r1=1.41.2.1.2.1&r2=1.41.2.1.2.2&diff_format=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.41.2.1.2.1
php-src/ext/standard/lcg.c:1.41.2.1.2.2
--- php-src/ext/standard/lcg.c:1.41.2.1.2.1 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/lcg.c Thu May 17 06:38:13 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: lcg.c,v 1.41.2.1.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: lcg.c,v 1.41.2.1.2.2 2007/05/17 06:38:13 rasmus Exp $ */
#include "php.h"
#include "php_lcg.h"
@@ -106,14 +106,6 @@
return SUCCESS;
}
-PHP_RINIT_FUNCTION(lcg)
-{
- if (!LCG(seeded)) {
- lcg_seed(TSRMLS_C);
- }
- return SUCCESS;
-}
-
/* {{{ proto float lcg_value()
Returns a value from the combined linear congruential generator */
PHP_FUNCTION(lcg_value)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_ext_syslog.h?r1=1.12.2.2.2.1&r2=1.12.2.2.2.2&diff_format=u
Index: php-src/ext/standard/php_ext_syslog.h
diff -u php-src/ext/standard/php_ext_syslog.h:1.12.2.2.2.1
php-src/ext/standard/php_ext_syslog.h:1.12.2.2.2.2
--- php-src/ext/standard/php_ext_syslog.h:1.12.2.2.2.1 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/php_ext_syslog.h Thu May 17 06:38:13 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ext_syslog.h,v 1.12.2.2.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: php_ext_syslog.h,v 1.12.2.2.2.2 2007/05/17 06:38:13 rasmus Exp $ */
#ifndef PHP_EXT_SYSLOG_H
#define PHP_EXT_SYSLOG_H
@@ -27,7 +27,9 @@
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
+#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog);
+#endif
PHP_MSHUTDOWN_FUNCTION(syslog);
PHP_FUNCTION(openlog);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.3.2.1&r2=1.49.2.3.2.2&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.49.2.3.2.1
php-src/ext/standard/syslog.c:1.49.2.3.2.2
--- php-src/ext/standard/syslog.c:1.49.2.3.2.1 Mon Jan 1 09:36:09 2007
+++ php-src/ext/standard/syslog.c Thu May 17 06:38:13 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.49.2.3.2.1 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: syslog.c,v 1.49.2.3.2.2 2007/05/17 06:38:13 rasmus Exp $ */
#include "php.h"
@@ -114,13 +114,13 @@
}
+#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog)
{
-#ifdef PHP_WIN32
closelog();
-#endif
return SUCCESS;
}
+#endif
PHP_MSHUTDOWN_FUNCTION(syslog)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
