iliaa Sat May 19 17:58:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sqlite sqlite.c php_sqlite.h
/php-src/ext/sockets sockets.c php_sockets.h
Log:
Remove pointless RINIT
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.8&r2=1.166.2.13.2.9&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.8
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.8 Sat May 5 15:36:15 2007
+++ php-src/ext/sqlite/sqlite.c Sat May 19 17:58:22 2007
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.13.2.8 2007/05/05 15:36:15 iliaa Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9 2007/05/19 17:58:22 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -295,7 +295,7 @@
sqlite_functions,
PHP_MINIT(sqlite),
PHP_MSHUTDOWN(sqlite),
- PHP_RINIT(sqlite),
+ NULL,
PHP_RSHUTDOWN(sqlite),
PHP_MINFO(sqlite),
#if ZEND_MODULE_API_NO >= 20010901
@@ -1124,16 +1124,11 @@
return SUCCESS;
}
-PHP_RINIT_FUNCTION(sqlite)
-{
- return SUCCESS;
-}
-
PHP_MINFO_FUNCTION(sqlite)
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.8 2007/05/05 15:36:15
iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9 2007/05/19 17:58:22
iliaa Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/php_sqlite.h?r1=1.32.2.2.2.1&r2=1.32.2.2.2.2&diff_format=u
Index: php-src/ext/sqlite/php_sqlite.h
diff -u php-src/ext/sqlite/php_sqlite.h:1.32.2.2.2.1
php-src/ext/sqlite/php_sqlite.h:1.32.2.2.2.2
--- php-src/ext/sqlite/php_sqlite.h:1.32.2.2.2.1 Mon Jan 1 09:36:07 2007
+++ php-src/ext/sqlite/php_sqlite.h Sat May 19 17:58:22 2007
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_sqlite.h,v 1.32.2.2.2.1 2007/01/01 09:36:07 sebastian Exp $
+ $Id: php_sqlite.h,v 1.32.2.2.2.2 2007/05/19 17:58:22 iliaa Exp $
*/
#ifndef PHP_SQLITE_H
@@ -38,7 +38,6 @@
PHP_MINIT_FUNCTION(sqlite);
PHP_MSHUTDOWN_FUNCTION(sqlite);
-PHP_RINIT_FUNCTION(sqlite);
PHP_RSHUTDOWN_FUNCTION(sqlite);
PHP_MINFO_FUNCTION(sqlite);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.8&r2=1.171.2.9.2.9&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.8
php-src/ext/sockets/sockets.c:1.171.2.9.2.9
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.8 Sun Feb 25 22:59:32 2007
+++ php-src/ext/sockets/sockets.c Sat May 19 17:58:22 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.8 2007/02/25 22:59:32 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.9 2007/05/19 17:58:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -158,7 +158,7 @@
sockets_functions,
PHP_MINIT(sockets),
NULL,
- PHP_RINIT(sockets),
+ NULL,
PHP_RSHUTDOWN(sockets),
PHP_MINFO(sockets),
NO_VERSION_YET,
@@ -515,13 +515,6 @@
}
/* }}} */
-/* {{{ PHP_RINIT_FUNCTION */
-PHP_RINIT_FUNCTION(sockets)
-{
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(sockets)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/php_sockets.h?r1=1.36.2.1.2.2&r2=1.36.2.1.2.3&diff_format=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.36.2.1.2.2
php-src/ext/sockets/php_sockets.h:1.36.2.1.2.3
--- php-src/ext/sockets/php_sockets.h:1.36.2.1.2.2 Wed Jan 10 15:25:07 2007
+++ php-src/ext/sockets/php_sockets.h Sat May 19 17:58:22 2007
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.36.2.1.2.2 2007/01/10 15:25:07 bjori Exp $ */
+/* $Id: php_sockets.h,v 1.36.2.1.2.3 2007/05/19 17:58:22 iliaa Exp $ */
#if HAVE_SOCKETS
@@ -41,7 +41,6 @@
PHP_MINIT_FUNCTION(sockets);
PHP_MINFO_FUNCTION(sockets);
-PHP_RINIT_FUNCTION(sockets);
PHP_RSHUTDOWN_FUNCTION(sockets);
PHP_FUNCTION(socket_select);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
