mboeren Fri Mar 23 02:23:58 2001 EDT
Added files:
/php4/ext/dbx .cvsignore
Removed files:
/php4/ext/dbx LICENSE
Modified files:
/php4/ext/dbx dbx.c dbx.dsp dbx.h dbx_mysql.c dbx_mysql.h
dbx_odbc.c dbx_odbc.h php_dbx.h
Log:
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)
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.2 php4/ext/dbx/dbx.c:1.3
--- php4/ext/dbx/dbx.c:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/dbx.c Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#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 @@
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 @@
/*/ 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 @@
}
}
/*/
-// 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 @@
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 @@
}
}
/*/
-// }
-// else {
-// FREE_ZVAL(rv_row);
-// }
+/ / }
+/ / else {
+/ / FREE_ZVAL(rv_row);
+/ / }
/*/
++row_count;
}
@@ -503,7 +509,7 @@
}
/* }}} */
/*/
-/////////// 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 @@
RETURN_LONG(1);
}
-/*///////////////*/
+/***********************************/
/* {{{ proto long dbx_test(???)
*/
@@ -664,7 +670,7 @@
/*/
-// 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 /*/
Index: php4/ext/dbx/dbx.dsp
diff -u php4/ext/dbx/dbx.dsp:1.1 php4/ext/dbx/dbx.dsp:1.2
--- php4/ext/dbx/dbx.dsp:1.1 Thu Mar 22 03:07:04 2001
+++ php4/ext/dbx/dbx.dsp Fri Mar 23 02:23:58 2001
@@ -44,7 +44,7 @@
# 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 @@
# 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,15 +118,7 @@
# 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
Index: php4/ext/dbx/dbx.h
diff -u php4/ext/dbx/dbx.h:1.1 php4/ext/dbx/dbx.h:1.2
--- php4/ext/dbx/dbx.h:1.1 Thu Mar 22 03:07:04 2001
+++ php4/ext/dbx/dbx.h Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#ifndef ZEND_DBX_H
#define ZEND_DBX_H
Index: php4/ext/dbx/dbx_mysql.c
diff -u php4/ext/dbx/dbx_mysql.c:1.2 php4/ext/dbx/dbx_mysql.c:1.3
--- php4/ext/dbx/dbx_mysql.c:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/dbx_mysql.c Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#include "dbx.h"
#include "dbx_mysql.h"
Index: php4/ext/dbx/dbx_mysql.h
diff -u php4/ext/dbx/dbx_mysql.h:1.2 php4/ext/dbx/dbx_mysql.h:1.3
--- php4/ext/dbx/dbx_mysql.h:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/dbx_mysql.h Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#ifndef ZEND_DBX_MYSQL_H
#define ZEND_DBX_MYSQL_H
Index: php4/ext/dbx/dbx_odbc.c
diff -u php4/ext/dbx/dbx_odbc.c:1.2 php4/ext/dbx/dbx_odbc.c:1.3
--- php4/ext/dbx/dbx_odbc.c:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/dbx_odbc.c Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#include "dbx.h"
#include "dbx_odbc.h"
@@ -226,7 +230,7 @@
}
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;
}
Index: php4/ext/dbx/dbx_odbc.h
diff -u php4/ext/dbx/dbx_odbc.h:1.2 php4/ext/dbx/dbx_odbc.h:1.3
--- php4/ext/dbx/dbx_odbc.h:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/dbx_odbc.h Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#ifndef ZEND_DBX_ODBC_H
#define ZEND_DBX_ODBC_H
Index: php4/ext/dbx/php_dbx.h
diff -u php4/ext/dbx/php_dbx.h:1.2 php4/ext/dbx/php_dbx.h:1.3
--- php4/ext/dbx/php_dbx.h:1.2 Thu Mar 22 07:14:34 2001
+++ php4/ext/dbx/php_dbx.h Fri Mar 23 02:23:58 2001
@@ -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 |
- | [EMAIL PROTECTED] 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 |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author : Marc Boeren <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
+*/
#ifndef ZEND_PHP_DBX_H
#define ZEND_PHP_DBX_H
Index: php4/ext/dbx/.cvsignore
+++ php4/ext/dbx/.cvsignore
Makefile
*.lo
*.la
libs
deps
libs.mk
dbx.plg
Debug_TS
Release_TS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
