Fixing prototypes and removing unused code

diff --git a/ext/fbsql/fbsql.dsp b/ext/fbsql/fbsql.dsp
index d59b67f5842e339d45fe8063b92ae895e31bc960..b19eae57afe0dfeb4add4db5a8b4a6951db62d67 100644 (file)
--- a/ext/fbsql/fbsql.dsp
+++ b/ext/fbsql/fbsql.dsp
@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 0cfa24c3174596b7705582c5e28b24390d2051fa..f1313fc0970f807c1904d7ae8f07d449a62c6de5 100644 (file)
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -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 @@ PHP_MINIT_FUNCTION(fbsql)
        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 @@ PHP_FUNCTION(fbsql_autocommit)
 }
 /* }}} */
 
-/* {{{ proto int fbsql_commit([resource link_identifier])
+/* {{{ proto bool fbsql_commit([resource link_identifier])
        */
 PHP_FUNCTION(fbsql_commit)
 {
@@ -1318,7 +1325,7 @@ PHP_FUNCTION(fbsql_drop_db)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(fbsql_start_db)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(fbsql_stop_db)
 /* }}} */
 
 /* {{{ 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 @@ int phpSizeOfInt (int i)
 }
 /* }}} */
 
-/* {{{ phpfbColumnAsString
- */
 void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* length, char** value)
 {
        FBCMetaData*               md          = result->metaData;
@@ -2158,7 +2163,6 @@ void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* len
                break;
        }
 }
-/* }}} */
 
 /* {{{ phpfbSqlResult 
  */

diff --git a/ext/fbsql/php_fbsql.h b/ext/fbsql/php_fbsql.h
index 7f6d0a6b56b0b7a7dfb3e9ce5252da5f0633e574..342138fce61f9493c34f97a35b644ab1d2cffcc1 100644 (file)
--- a/ext/fbsql/php_fbsql.h
+++ b/ext/fbsql/php_fbsql.h
@@ -110,7 +110,6 @@ ZEND_BEGIN_MODULE_GLOBALS(fbsql)
    long persistantCount;
    long linkCount;
    long linkIndex;
-
 ZEND_END_MODULE_GLOBALS(fbsql)
 
 #ifdef ZTS
@@ -129,6 +128,4 @@ ZEND_END_MODULE_GLOBALS(fbsql)
 #error not ok
 #endif //  HAVE_FBSQL
 
-#define phpext_fbsql_ptr fbsql_module_ptr
-
 #endif /* _PHP_FBSQL_H */