diff options
author | Marc Boeren <mboeren@php.net> | 2001-03-23 10:23:58 +0000 |
---|---|---|
committer | Marc Boeren <mboeren@php.net> | 2001-03-23 10:23:58 +0000 |
commit | 10bb608e4ee8ecb0b69b91ce1a297dd6ca53415a (patch) | |
tree | 9bf4daaf93ca8665295d565906f9460ee605f7ec /ext/dbx | |
parent | 01ac20050e7f61e533d9cade8f26be2c7f139bf4 (diff) | |
download | php-git-10bb608e4ee8ecb0b69b91ce1a297dd6ca53415a.tar.gz |
Changed header for source files, now point to PHP license (Mc)
Found another // comment and replaced with /**/ (Mc)
Removed proprietary license (in favor of php license) (Mc)
Added .cvsignore file, I hope it works correctly (Mc)
Diffstat (limited to 'ext/dbx')
-rw-r--r-- | ext/dbx/LICENSE | 71 | ||||
-rw-r--r-- | ext/dbx/dbx.c | 70 | ||||
-rw-r--r-- | ext/dbx/dbx.dsp | 12 | ||||
-rw-r--r-- | ext/dbx/dbx.h | 20 | ||||
-rw-r--r-- | ext/dbx/dbx_mysql.c | 20 | ||||
-rw-r--r-- | ext/dbx/dbx_mysql.h | 20 | ||||
-rw-r--r-- | ext/dbx/dbx_odbc.c | 22 | ||||
-rw-r--r-- | ext/dbx/dbx_odbc.h | 20 | ||||
-rw-r--r-- | ext/dbx/php_dbx.h | 20 |
9 files changed, 113 insertions, 162 deletions
diff --git a/ext/dbx/LICENSE b/ext/dbx/LICENSE deleted file mode 100644 index a784d4f184..0000000000 --- a/ext/dbx/LICENSE +++ /dev/null @@ -1,71 +0,0 @@ --------------------------------------------------------------------- - The DBX License, version 0.01 -Copyright (c) 2001 Guidance bv. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - 3. The name "DBX" must not be used to endorse or promote products - derived from this software without prior permission from - Guidance bv. This does not apply to add-on libraries or tools - that work in conjunction with DBX. In such a case the DBX - name may be used to indicate that the product supports DBX. - - 4. Guidance bv may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the - terms of that version. You may also choose to use such covered - code under the terms of any subsequent version of the license - published by Guidance bv. No one other than Guidance bv has - the right to modify the terms applicable to covered code created - under this License. - - 5. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes DBX, freely available from - http://www.guidance.nl/dbx". - - 6. The software is an add-on to PHP, which is freely available from - http://www.php.net. Be sure to read their license as well. - - -THIS SOFTWARE IS PROVIDED BY GUIDANCE BV ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GUIDANCE BV - OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -Guidance bv can be contacted via Email at m.boeren@guidance.nl. - -For more information on Guidance bv and the DBX project, -please see <http://www.guidance.nl>. - -The software is an add-on to the PHP project, whihc consists of -voluntary contributions made by many individuals on behalf of the -PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see <http://www.php.net>. diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c index 7170a9c468..67f0c9497a 100644 --- a/ext/dbx/dbx.c +++ b/ext/dbx/dbx.c @@ -1,26 +1,32 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #include "php.h" #include "php_ini.h" -#include "php_config.h" #include "php_dbx.h" #include "ext/standard/info.h" +#if !(WIN32|WINNT) +#include "php_config.h" +#endif /*/ defines for supported databases /*/ #define DBX_UNKNOWN 0 @@ -61,7 +67,7 @@ void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, z if (call_user_function_ex(EG(function_table), NULL, zval_function_name, returnvalue, number_of_arguments, params, 0, NULL) == FAILURE) { zend_error(E_ERROR, "function '%s' not found", zval_function_name->value.str.val); } - zval_dtor(zval_function_name); // to free stringvalue memory + zval_dtor(zval_function_name); /*/ to free stringvalue memory /*/ FREE_ZVAL(zval_function_name); } @@ -180,12 +186,12 @@ ZEND_MINFO_FUNCTION(dbx) /*/ DISPLAY_INI_ENTRIES(); /*/ } /*/ -// -// actual implementation of the dbx functions -// -// -// -// +/ / +/ / actual implementation of the dbx functions +/ / +/ / +/ / +/ / /*/ /* {{{ proto dbx_handle_object dbx_connect(string module_name, string host, string db, string username, string password [, bool persistent]) returns a dbx_handle_object on success @@ -330,14 +336,14 @@ ZEND_FUNCTION(dbx_query) } } /*/ -// if (ZEND_NUM_ARGS()>3) { -// convert_to_long_ex(arguments[3]); -// result_row_offset = (*arguments[3])->value.lval; -// } -// if (ZEND_NUM_ARGS()>4) { -// convert_to_long_ex(arguments[4]); -// result_row_count = (*arguments[4])->value.lval; -// } +/ / if (ZEND_NUM_ARGS()>3) { +/ / convert_to_long_ex(arguments[3]); +/ / result_row_offset = (*arguments[3])->value.lval; +/ / } +/ / if (ZEND_NUM_ARGS()>4) { +/ / convert_to_long_ex(arguments[4]); +/ / result_row_count = (*arguments[4])->value.lval; +/ / } /*/ MAKE_STD_ZVAL(rv_result_handle); convert_to_string_ex(arguments[1]); @@ -349,7 +355,7 @@ ZEND_FUNCTION(dbx_query) RETURN_LONG(result?1:0); } /*/ if you get here, the query succeeded and returned results, so we'll return them - // rv_result_handle holds a resource + / / rv_result_handle holds a resource /*/ /*/ init return_value as object (of rows) /*/ if (object_init(return_value) != SUCCESS) { @@ -456,10 +462,10 @@ ZEND_FUNCTION(dbx_query) } } /*/ -// } -// else { -// FREE_ZVAL(rv_row); -// } +/ / } +/ / else { +/ / FREE_ZVAL(rv_row); +/ / } /*/ ++row_count; } @@ -503,7 +509,7 @@ ZEND_FUNCTION(dbx_error) } /* }}} */ /*/ -/////////// dbx functions that are database independent... like sorting result_objects! +/ / dbx functions that are database independent... like sorting result_objects! /*/ /* {{{ proto long dbx_cmp_asc(array row_x, array row_y, string columnname) returns row_x[columnname] - row_y[columnname], converted to -1, 0 or 1 @@ -649,7 +655,7 @@ ZEND_FUNCTION(dbx_sort) RETURN_LONG(1); } -/*///////////////*/ +/***********************************/ /* {{{ proto long dbx_test(???) */ @@ -664,7 +670,7 @@ ZEND_FUNCTION(dbx_test) /*/ -// switch_dbx functions +/ / switch_dbx functions /*/ int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { /*/ returns connection handle as resource on success or 0 as long on failure /*/ diff --git a/ext/dbx/dbx.dsp b/ext/dbx/dbx.dsp index 4998d59a37..3a964642a4 100644 --- a/ext/dbx/dbx.dsp +++ b/ext/dbx/dbx.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_dbx" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "dbx_EXPORTS" /D "COMPILE_DL_dbx" /D ZTS=1 /D HAVE_LIBINTL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "DBX_EXPORTS" /D "COMPILE_DL_DBX" /D ZTS=1 /D HAVE_LIBINTL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL_dbx" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dbx_EXPORTS" /D "COMPILE_DL_dbx" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LIBINTL=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBX_EXPORTS" /D "COMPILE_DL_DBX" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LIBINTL=1 /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -118,18 +118,10 @@ SOURCE=.\dbx_mysql.h # End Source File
# Begin Source File
-SOURCE=.\x\dbx_mysql.h
-# End Source File
-# Begin Source File
-
SOURCE=.\dbx_odbc.h
# End Source File
# Begin Source File
-SOURCE=.\x\dbx_odbc.h
-# End Source File
-# Begin Source File
-
SOURCE=.\php_dbx.h
# End Source File
# End Group
diff --git a/ext/dbx/dbx.h b/ext/dbx/dbx.h index f98e1deb24..8e0f37b340 100644 --- a/ext/dbx/dbx.h +++ b/ext/dbx/dbx.h @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #ifndef ZEND_DBX_H #define ZEND_DBX_H diff --git a/ext/dbx/dbx_mysql.c b/ext/dbx/dbx_mysql.c index 4c42fa1e3d..1a4354dfe9 100644 --- a/ext/dbx/dbx_mysql.c +++ b/ext/dbx/dbx_mysql.c @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #include "dbx.h" #include "dbx_mysql.h" diff --git a/ext/dbx/dbx_mysql.h b/ext/dbx/dbx_mysql.h index 3ba5c7761d..e68f66d30f 100644 --- a/ext/dbx/dbx_mysql.h +++ b/ext/dbx/dbx_mysql.h @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #ifndef ZEND_DBX_MYSQL_H #define ZEND_DBX_MYSQL_H diff --git a/ext/dbx/dbx_odbc.c b/ext/dbx/dbx_odbc.c index b80cce08ca..dd39b54b12 100644 --- a/ext/dbx/dbx_odbc.c +++ b/ext/dbx/dbx_odbc.c @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #include "dbx.h" #include "dbx_odbc.h" @@ -226,7 +230,7 @@ int dbx_odbc_getrow(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMET } int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns empty string // no equivalent in odbc module (yet???) /*/ + /*/ returns empty string, no equivalent in odbc module (yet???) /*/ ZVAL_EMPTY_STRING((*rv)); return 1; } diff --git a/ext/dbx/dbx_odbc.h b/ext/dbx/dbx_odbc.h index ddce32ed8a..c08832776f 100644 --- a/ext/dbx/dbx_odbc.h +++ b/ext/dbx/dbx_odbc.h @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #ifndef ZEND_DBX_ODBC_H #define ZEND_DBX_ODBC_H diff --git a/ext/dbx/php_dbx.h b/ext/dbx/php_dbx.h index ae2e780318..6b8a193817 100644 --- a/ext/dbx/php_dbx.h +++ b/ext/dbx/php_dbx.h @@ -1,20 +1,24 @@ /* +----------------------------------------------------------------------+ - | stentor module version 1.0 | + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | dbx module version 1.0 | +----------------------------------------------------------------------+ | Copyright (c) 2001 Guidance Rotterdam BV | +----------------------------------------------------------------------+ - | This source file is subject to version 1.0 of the STENTOR license, | + | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at | - | http://www.guidance.nl/php/dbx/license/1_00.txt. | - | If you did not receive a copy of the STENTOR license and are unable | - | to obtain it through the world-wide-web, please send a note to | - | license@guidance.nl so we can mail you a copy immediately. | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author : Marc Boeren <marc@guidance.nl> | +----------------------------------------------------------------------+ - */ +*/ #ifndef ZEND_PHP_DBX_H #define ZEND_PHP_DBX_H |