cvs: php4 /ext/fbsql fbsql.dsp php_fbsql.c php_fbsql.h

fmk Mon Oct 8 12:42:20 2001 EDT Modified files: /php4/ext/fbsql php_fbsql.h php_fbsql.c fbsql.dsp Log: Fixing prototypes and removing unused code Index: php4/ext/fbsql/php_fbsql.h diff -u php4/ext/fbsql/php_fbsql.h:1.11 php4/ext/fbsql/php_fbsql.h:1.12 --- php4/ext/fbsql/php_fbsql.h:1.11 Thu Sep 6 12:49:17 2001 +++ php4/ext/fbsql/php_fbsql.h Mon Oct 8 12:42:19 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.h,v 1.11 2001/09/06 16:49:17 fmk Exp $ */ +/* $Id: php_fbsql.h,v 1.12 2001/10/08 16:42:19 fmk Exp $ */ #define HAVE_FBSQL 1 @@ -110,7 +110,6 @@ long persistantCount; long linkCount; long linkIndex; - ZEND_END_MODULE_GLOBALS(fbsql) #ifdef ZTS @@ -128,7 +127,5 @@ #define fbsql_module_ptr NULL #error not ok #endif // HAVE_FBSQL - -#define phpext_fbsql_ptr fbsql_module_ptr #endif /* _PHP_FBSQL_H */ Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.50 php4/ext/fbsql/php_fbsql.c:1.51 --- php4/ext/fbsql/php_fbsql.c:1.50 Tue Sep 25 18:48:33 2001 +++ php4/ext/fbsql/php_fbsql.c Mon Oct 8 12:42:19 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.50 2001/09/25 22:48:33 jeroen Exp $ */ +/* $Id: php_fbsql.c,v 1.51 2001/10/08 16:42:19 fmk Exp $ */ /* TODO: * @@ -40,7 +40,6 @@ #include "php.h" #include "php_globals.h" -#include "php_globals.h" #include "ext/standard/info.h" #include "ext/standard/php_string.h" @@ -400,6 +399,14 @@ REGISTER_LONG_CONSTANT("FBSQL_ISO_SERIALIZABLE ", FBSQL_ISO_SERIALIZABLE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FBSQL_ISO_VERSIONED", FBSQL_ISO_VERSIONED, CONST_CS | CONST_PERSISTENT); + /* Register Status constants */ + REGISTER_LONG_CONSTANT("FBSQL_UNKNOWN", FBUnknownStatus, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FBSQL_STOPPED", FBStopped, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FBSQL_STARTING", FBStarting, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FBSQL_RUNNING", FBRunning, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FBSQL_STOPPING", FBStopping, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FBSQL_NOEXEC", FBNoExec, CONST_CS | CONST_PERSISTENT); + return SUCCESS; } @@ -819,7 +826,7 @@ } /* }}} */ -/* {{{ proto int fbsql_commit([resource link_identifier]) +/* {{{ proto bool fbsql_commit([resource link_identifier]) */ PHP_FUNCTION(fbsql_commit) { @@ -1318,7 +1325,7 @@ } /* }}} */ -/* {{{ proto int fbsql_start_db(string database_name [, resource link_identifier]) +/* {{{ proto bool fbsql_start_db(string database_name [, resource link_identifier]) */ PHP_FUNCTION(fbsql_start_db) { @@ -1393,7 +1400,7 @@ } /* }}} */ -/* {{{ proto int fbsql_stop_db(string database_name [, resource link_identifier]) +/* {{{ proto bool fbsql_stop_db(string database_name [, resource link_identifier]) */ PHP_FUNCTION(fbsql_stop_db) { @@ -1452,7 +1459,7 @@ /* }}} */ /* {{{ proto int fbsql_db_status(string database_name [, resource link_identifier]) - Get the status (Stoped, Starting, Started, Stopping) for a given database*/ + Get the status (Stoped, Starting, Running, Stopping) for a given database*/ PHP_FUNCTION(fbsql_db_status) { PHPFBLink* phpLink = NULL; @@ -1975,8 +1982,6 @@ } /* }}} */ -/* {{{ phpfbColumnAsString - */ void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* length, char** value) { FBCMetaData* md = result->metaData; @@ -2158,7 +2163,6 @@ break; } } -/* }}} */ /* {{{ phpfbSqlResult */ Index: php4/ext/fbsql/fbsql.dsp diff -u php4/ext/fbsql/fbsql.dsp:1.2 php4/ext/fbsql/fbsql.dsp:1.3 --- php4/ext/fbsql/fbsql.dsp:1.2 Mon Apr 30 07:09:03 2001 +++ php4/ext/fbsql/fbsql.dsp Mon Oct 8 12:42:19 2001 @@ -123,7 +123,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FBSQL_EXPORTS" /D "COMPILE_DL_FBSQL" /D HAVE_FBSQL=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "\usr\FrontBase\Include" /D "NDEBUG" /D "ZTS" /D ZEND_DEBUG=0 /D "FBSQL_EXPORTS" /D "COMPILE_DL_FBSQL" /D HAVE_FBSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "\usr\FrontBase\Include" /D "NDEBUG" /D ZTS=1 /D ZEND_DEBUG=0 /D "FBSQL_EXPORTS" /D "COMPILE_DL_FBSQL" /D HAVE_FBSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG"