]> granicus.if.org Git - php/commitdiff
ext/msql has been moved from php-src to PECL adhead of PHP 5.3
authorLukas Smith <lsmith@php.net>
Tue, 4 Nov 2008 22:22:37 +0000 (22:22 +0000)
committerLukas Smith <lsmith@php.net>
Tue, 4 Nov 2008 22:22:37 +0000 (22:22 +0000)
ext/msql/CREDITS [deleted file]
ext/msql/config.m4 [deleted file]
ext/msql/config.w32 [deleted file]
ext/msql/msql.dsp [deleted file]
ext/msql/php_msql.c [deleted file]
ext/msql/php_msql.h [deleted file]

diff --git a/ext/msql/CREDITS b/ext/msql/CREDITS
deleted file mode 100644 (file)
index 31ad918..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-mSQL
-Zeev Suraski
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
deleted file mode 100644 (file)
index ec75777..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-dnl
-dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
-dnl
-AC_DEFUN([PHP_MSQL_VERSION],[
-  AC_MSG_CHECKING([mSQL version])
-  ac_php_oldcppflags=$CPPFLAGS
-  CPPFLAGS="$INCLUDES $CPPFLAGS"
-  AC_TRY_COMPILE([#include <sys/types.h>
-#include "msql.h"],[int i = IDX_TYPE],[
-    AC_DEFINE(MSQL1,0,[ ])
-    MSQL_VERSION="2.0 or newer"
-  ],[
-    AC_DEFINE(MSQL1,1,[ ])
-    MSQL_VERSION=1.0
-  ])
-  CPPFLAGS=$ac_php_oldcppflags
-  AC_MSG_RESULT($MSQL_VERSION)
-])
-
-PHP_ARG_WITH(msql,for mSQL support,
-[  --with-msql[=DIR]       Include mSQL support.  DIR is the mSQL base
-                          install directory [/usr/local/Hughes]])
-
-  if test "$PHP_MSQL" != "no"; then
-    if test "$PHP_MSQL" = "yes"; then
-      MSQL_INCDIR=/usr/local/Hughes/include
-      MSQL_LIBDIR=/usr/local/Hughes/lib
-    else
-      MSQL_INCDIR=$PHP_MSQL/include
-      MSQL_LIBDIR=$PHP_MSQL/lib
-    fi
-    PHP_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR, MSQL_SHARED_LIBADD)
-    PHP_ADD_INCLUDE($MSQL_INCDIR)
-    AC_DEFINE(HAVE_MSQL,1,[ ])
-    PHP_SUBST(MSQL_SHARED_LIBADD)
-    PHP_NEW_EXTENSION(msql, php_msql.c, $ext_shared)
-    PHP_MSQL_VERSION
-  fi
diff --git a/ext/msql/config.w32 b/ext/msql/config.w32
deleted file mode 100644 (file)
index 902f57d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-ARG_WITH("msql", "MSQL support", "no");
-
-if (PHP_MSQL != "no") {
-
-       if (CHECK_HEADER_ADD_INCLUDE("msql.h", "CFLAGS_MSQL", PHP_MSQL) &&
-                       CHECK_LIB("msql_dll.lib", "msql", PHP_MSQL)) {
-               EXTENSION('msql', 'php_msql.c');
-
-               AC_DEFINE('HAVE_MSQL', 1);
-
-       } else {
-               WARNING("msql not enabled; libraries and headers not found");
-       }
-}
-
diff --git a/ext/msql/msql.dsp b/ext/msql/msql.dsp
deleted file mode 100644 (file)
index a8f5724..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="msql" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=msql - Win32 Debug_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "msql.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "msql.mak" CFG="msql - Win32 Debug_TS"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "msql - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "msql - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "msql - Win32 Release_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release_TS"\r
-# PROP BASE Intermediate_Dir "Release_TS"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSQL_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\win32" /D "WIN32" /D "COMPILE_DL_MSQL" /D ZTS=1 /D HAVE_MSQL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /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 0x407 /d "NDEBUG"\r
-# ADD RSC /l 0x407 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib php5ts.lib msql_dll.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_msql.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-\r
-!ELSEIF  "$(CFG)" == "msql - Win32 Debug_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug_TS"\r
-# PROP BASE Intermediate_Dir "Debug_TS"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSQL_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_MSQL=1 /D COMPILE_DL_MSQL=1 /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x407 /d "_DEBUG"\r
-# ADD RSC /l 0x407 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib php5ts_debug.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_msql.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "msql - Win32 Release_TS"\r
-# Name "msql - Win32 Debug_TS"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\php_msql.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\php_msql.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
deleted file mode 100644 (file)
index 8d56c92..0000000
+++ /dev/null
@@ -1,1383 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.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: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_ini.h"
-#include "php_msql.h"
-#include "ext/standard/php_standard.h"
-#include "ext/standard/info.h"
-#include "php_globals.h"
-
-#if HAVE_MSQL
-
-#define OS_UNIX 1
-
-#if defined(WIN32) && defined(MSQL1)
-#include <msql1.h>
-#else
-#include <msql.h>
-#endif
-
-static php_msql_globals msql_globals;
-
-#define MSQL_ASSOC             1<<0
-#define MSQL_NUM               1<<1
-#define MSQL_BOTH              (MSQL_ASSOC|MSQL_NUM)
-
-/* {{{ arginfo */
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_connect, 0, 0, 0)
-       ZEND_ARG_INFO(0, hostname)
-       ZEND_ARG_INFO(0, username)
-       ZEND_ARG_INFO(0, password)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_pconnect, 0, 0, 0)
-       ZEND_ARG_INFO(0, hostname)
-       ZEND_ARG_INFO(0, username)
-       ZEND_ARG_INFO(0, password)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_close, 0, 0, 0)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_select_db, 0, 0, 1)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_create_db, 0, 0, 1)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_drop_db, 0, 0, 1)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_query, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_db_query, 0, 0, 2)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_dbs, 0, 0, 0)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_tables, 0, 0, 1)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_fields, 0, 0, 2)
-       ZEND_ARG_INFO(0, database_name)
-       ZEND_ARG_INFO(0, table_name)
-       ZEND_ARG_INFO(0, link_identifier)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO(arginfo_msql_error, 0)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_result, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, row)
-       ZEND_ARG_INFO(0, field)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_rows, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_fields, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_row, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_object, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, result_type)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_array, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, result_type)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_data_seek, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_field, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offset)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_seek, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offset)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_name, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_index)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_table, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offset)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_len, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offet)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_type, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offset)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_flags, 0, 0, 2)
-       ZEND_ARG_INFO(0, query)
-       ZEND_ARG_INFO(0, field_offset)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_free_result, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_affected_rows, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-/* }}} */
-
-/* {{{ msql_functions[]
- */
-const zend_function_entry msql_functions[] = {
-       PHP_FE(msql_connect,                                                    arginfo_msql_connect)
-       PHP_FE(msql_pconnect,                                                   arginfo_msql_pconnect)
-       PHP_FE(msql_close,                                                              arginfo_msql_close)
-       PHP_FE(msql_select_db,                                                  arginfo_msql_select_db)
-       PHP_FE(msql_create_db,                                                  arginfo_msql_create_db)
-       PHP_FE(msql_drop_db,                                                    arginfo_msql_drop_db)
-       PHP_FE(msql_query,                                                              arginfo_msql_query)
-       PHP_FE(msql_db_query,                                                   arginfo_msql_db_query)
-       PHP_FE(msql_list_dbs,                                                   arginfo_msql_list_dbs)
-       PHP_FE(msql_list_tables,                                                arginfo_msql_list_tables)
-       PHP_FE(msql_list_fields,                                                arginfo_msql_list_fields)
-       PHP_FE(msql_error,                                                              arginfo_msql_error)
-       PHP_FE(msql_result,                                                             arginfo_msql_result)
-       PHP_FE(msql_num_rows,                                                   arginfo_msql_num_rows)
-       PHP_FE(msql_num_fields,                                                 arginfo_msql_num_fields)
-       PHP_FE(msql_fetch_row,                                                  arginfo_msql_fetch_row)
-       PHP_FE(msql_fetch_array,                                                arginfo_msql_fetch_array)
-       PHP_FE(msql_fetch_object,                                               arginfo_msql_fetch_object)
-       PHP_FE(msql_data_seek,                                                  arginfo_msql_data_seek)
-       PHP_FE(msql_fetch_field,                                                arginfo_msql_fetch_field)
-       PHP_FE(msql_field_seek,                                                 arginfo_msql_field_seek)
-       PHP_FE(msql_free_result,                                                arginfo_msql_free_result)
-       PHP_FE(msql_field_name,                                                 arginfo_msql_field_name)
-       PHP_FE(msql_field_table,                                                arginfo_msql_field_table)
-       PHP_FE(msql_field_len,                                                  arginfo_msql_field_len)
-       PHP_FE(msql_field_type,                                                 arginfo_msql_field_type)
-       PHP_FE(msql_field_flags,                                                arginfo_msql_field_flags)
-       
-       PHP_FALIAS(msql_fieldname,              msql_field_name,                arginfo_msql_field_name)
-       PHP_FALIAS(msql_fieldtable,             msql_field_table,               arginfo_msql_field_table)
-       PHP_FALIAS(msql_fieldlen,               msql_field_len,                 arginfo_msql_field_len)
-       PHP_FALIAS(msql_fieldtype,              msql_field_type,                arginfo_msql_field_type)
-       PHP_FALIAS(msql_fieldflags,             msql_field_flags,               arginfo_msql_field_flags)
-       
-       PHP_FALIAS(msql_affected_rows,  msql_affected_rows,             arginfo_msql_affected_rows)
-       
-       /* for downwards compatability */
-       PHP_FALIAS(msql,                                msql_db_query,                  arginfo_msql_db_query)
-       PHP_FALIAS(msql_selectdb,               msql_select_db,                 arginfo_msql_select_db)
-       PHP_FALIAS(msql_createdb,               msql_create_db,                 arginfo_msql_create_db)
-       PHP_FALIAS(msql_dropdb,                 msql_drop_db,                   arginfo_msql_drop_db)
-       PHP_FALIAS(msql_freeresult,             msql_free_result,               arginfo_msql_free_result)
-       PHP_FALIAS(msql_numfields,              msql_num_fields,                arginfo_msql_num_fields)
-       PHP_FALIAS(msql_numrows,                msql_num_rows,                  arginfo_msql_num_rows)
-       PHP_FALIAS(msql_listdbs,                msql_list_dbs,                  arginfo_msql_list_dbs)
-       PHP_FALIAS(msql_listtables,             msql_list_tables,               arginfo_msql_list_tables)
-       PHP_FALIAS(msql_listfields,             msql_list_fields,               arginfo_msql_list_fields)
-       PHP_FALIAS(msql_dbname,                 msql_result,                    arginfo_msql_result)
-       PHP_FALIAS(msql_tablename,              msql_result,                    arginfo_msql_result)
-       {NULL, NULL, NULL}
-};
-/* }}} */
-
-zend_module_entry msql_module_entry = {
-       STANDARD_MODULE_HEADER,
-       "msql", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL,
-                       PHP_MINFO(msql), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
-};
-
-
-#ifdef COMPILE_DL_MSQL
-ZEND_GET_MODULE(msql)
-#endif
-
-typedef struct {
-       m_result *result;
-       int af_rows;
-} m_query;
-
-#define MSQL_GET_QUERY(res)                                                                                                                                                    \
-       ZEND_FETCH_RESOURCE(msql_query, m_query *, &res, -1, "mSQL result", msql_globals.le_query);     \
-       msql_result = msql_query->result
-
-static void _delete_query(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       m_query *query = (m_query *)rsrc->ptr;
-
-       if(query->result) msqlFreeResult(query->result);
-       efree(query);
-}
-
-static m_query *php_msql_query_wrapper(m_result *res, int af_rows)
-{
-       m_query *query = (m_query *) emalloc(sizeof(m_query));
-       
-       query->result = res;
-       query->af_rows = af_rows;
-       
-       return query;
-}
-
-static void _close_msql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       int link = (int)rsrc->ptr;
-
-       msqlClose(link);
-       msql_globals.num_links--;
-}
-
-
-static void _close_msql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       int link = (int)rsrc->ptr;
-
-       msqlClose(link);
-       msql_globals.num_persistent--;
-       msql_globals.num_links--;
-}
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(msql)
-{
-       if (cfg_get_long("msql.allow_persistent",&msql_globals.allow_persistent)==FAILURE) {
-               msql_globals.allow_persistent=1;
-       }
-       if (cfg_get_long("msql.max_persistent",&msql_globals.max_persistent)==FAILURE) {
-               msql_globals.max_persistent=-1;
-       }
-       if (cfg_get_long("msql.max_links",&msql_globals.max_links)==FAILURE) {
-               msql_globals.max_links=-1;
-       }
-       msql_globals.num_persistent=0;
-       msql_globals.le_query = zend_register_list_destructors_ex(_delete_query, NULL, "msql query", module_number);
-       msql_globals.le_link = zend_register_list_destructors_ex(_close_msql_link, NULL, "msql link", module_number);
-       msql_globals.le_plink = zend_register_list_destructors_ex(NULL, _close_msql_plink, "msql link persistent", module_number);
-       
-       Z_TYPE(msql_module_entry) = type;
-
-       REGISTER_LONG_CONSTANT("MSQL_ASSOC", MSQL_ASSOC, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("MSQL_NUM", MSQL_NUM, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("MSQL_BOTH", MSQL_BOTH, CONST_CS | CONST_PERSISTENT);
-
-       return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(msql)
-{
-       msql_globals.default_link=-1;
-       msql_globals.num_links = msql_globals.num_persistent;
-       msqlErrMsg[0]=0;
-       return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(msql)
-{
-       char maxp[32],maxl[32];
-
-       if (msql_globals.max_persistent==-1) {
-               snprintf(maxp, 31, "%d/unlimited", msql_globals.num_persistent );
-       } else {
-               snprintf(maxp, 31, "%d/%ld", msql_globals.num_persistent, msql_globals.max_persistent);
-       }
-       maxp[31]=0;
-
-       if (msql_globals.max_links==-1) {
-               snprintf(maxl, 15, "%d/unlimited", msql_globals.num_links );
-       } else {
-               snprintf(maxl, 15, "%d/%ld", msql_globals.num_links, msql_globals.max_links);
-       }
-       maxl[31]=0;
-
-       php_info_print_table_start();
-       php_info_print_table_row(2, "MSQL Support", "enabled" );
-       php_info_print_table_row(2, "Allow Persistent Links", (msql_globals.allow_persistent?"yes":"no") );
-       php_info_print_table_row(2, "Persistent Links", maxp );
-       php_info_print_table_row(2, "Total Links", maxl );
-       php_info_print_table_end();
-
-}
-/* }}} */
-
-/* {{{ php_msql_do_connect
- */
-static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
-{
-       char *host;
-       char *hashed_details;
-       int hashed_details_length;
-       int msql;
-       
-       switch(ZEND_NUM_ARGS()) {
-               case 0: /* defaults */
-                       host=NULL;
-                       hashed_details=estrndup("msql_",5);
-                       hashed_details_length=4+1;
-                       break;
-               case 1: {
-                               zval *yyhost;
-                       
-                               if (zend_get_parameters(ht, 1, &yyhost) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string(yyhost);
-                               host = Z_STRVAL_P(yyhost);
-                               hashed_details_length = spprintf(&hashed_details, 0, "msql_%s",Z_STRVAL_P(yyhost));
-                       }
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       if (!msql_globals.allow_persistent) {
-               persistent=0;
-       }
-       if (persistent) {
-               zend_rsrc_list_entry *le;
-               
-               if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", msql_globals.num_links);
-                       efree(hashed_details);
-                       RETURN_FALSE;
-               }
-               if (msql_globals.max_persistent!=-1 && msql_globals.num_persistent>=msql_globals.max_persistent) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", msql_globals.num_persistent);
-                       efree(hashed_details);
-                       RETURN_FALSE;
-               }
-               
-               /* try to find if we already have this link in our persistent list */
-               if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) {  /* we don't */
-                       zend_rsrc_list_entry new_le;
-                       
-                       /* create the link */
-                       if ((msql=msqlConnect(host))==-1) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A link to the server could not be established");
-                               efree(hashed_details);
-                               RETURN_FALSE;
-                       }
-                       
-                       /* hash it up */
-                       Z_TYPE(new_le) = msql_globals.le_plink;
-                       new_le.ptr = (void *) msql;
-                       if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) {
-                               efree(hashed_details);
-                               RETURN_FALSE;
-                       }
-                       msql_globals.num_persistent++;
-                       msql_globals.num_links++;
-               } else {  /* we do */
-                       if (Z_TYPE_P(le) != msql_globals.le_plink) {
-                               efree(hashed_details);
-                               RETURN_FALSE;
-                       }
-#if 0
-                       /* ensure that the link did not die */
-                       /* still have to find a way to do this nicely with mSQL */
-                       if (msql_stat(le->ptr)==NULL) { /* the link died */
-                               if (msql_connect(le->ptr,host,user,passwd)==NULL) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "mSQL link lost, unable to reconnect");
-                                       zend_hash_del(&EG(persistent_list),hashed_details,hashed_details_length+1);
-                                       efree(hashed_details);
-                                       RETURN_FALSE;
-                               }
-                       }
-#endif
-                       msql = (int) le->ptr;
-               }
-               ZEND_REGISTER_RESOURCE(return_value, (void *) msql, msql_globals.le_plink);
-       } else {
-               zend_rsrc_list_entry *index_ptr,new_index_ptr;
-               
-               /* first we check the hash for the hashed_details key.  if it exists,
-                * it should point us to the right offset where the actual msql link sits.
-                * if it doesn't, open a new msql link, add it to the resource list,
-                * and add a pointer to it with hashed_details as the key.
-                */
-               if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) {
-                       int type,link;
-                       void *ptr;
-
-                       if (Z_TYPE_P(index_ptr) != le_index_ptr) {
-                               RETURN_FALSE;
-                       }
-                       link = (int) index_ptr->ptr;
-                       ptr = zend_list_find(link,&type);   /* check if the link is still there */
-                       if (ptr && (type==msql_globals.le_link || type==msql_globals.le_plink)) {
-                               Z_LVAL_P(return_value) = msql_globals.default_link = link;
-                               Z_TYPE_P(return_value) = IS_RESOURCE;
-                               efree(hashed_details);
-                               return;
-                       } else {
-                               zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1);
-                       }
-               }
-               if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", msql_globals.num_links);
-                       efree(hashed_details);
-                       RETURN_FALSE;
-               }
-               if ((msql=msqlConnect(host))==-1) {
-                       efree(hashed_details);
-                       RETURN_FALSE;
-               }
-
-               /* add it to the list */
-               ZEND_REGISTER_RESOURCE(return_value, (void *) msql, msql_globals.le_link);
-               
-               /* add it to the hash */
-               new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
-               Z_TYPE(new_index_ptr) = le_index_ptr;
-               if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) {
-                       efree(hashed_details);
-                       RETURN_FALSE;
-               }
-               msql_globals.num_links++;
-       }
-       efree(hashed_details);
-       msql_globals.default_link=Z_LVAL_P(return_value);
-}
-/* }}} */
-
-/* {{{ php_msql_get_default_link
- */
-static int php_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
-{
-       if (msql_globals.default_link==-1) { /* no link opened yet, implicitly open one */
-               ht = 0;
-               php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-       }
-       return msql_globals.default_link;
-}
-/* }}} */
-
-/* {{{ proto int msql_connect([string hostname[:port]] [, string username] [, string password])
-   Open a connection to an mSQL Server */
-PHP_FUNCTION(msql_connect)
-{
-       php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
-}
-/* }}} */
-
-/* {{{ proto int msql_pconnect([string hostname[:port]] [, string username] [, string password])
-   Open a persistent connection to an mSQL Server */
-PHP_FUNCTION(msql_pconnect)
-{
-       php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
-}
-/* }}} */
-
-/* {{{ proto bool msql_close([resource link_identifier])
-   Close an mSQL connection */
-PHP_FUNCTION(msql_close)
-{
-       zval *msql_link = NULL;
-       int id = -1;
-       int msql;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 0) {
-               id = msql_globals.default_link;
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (id==-1) { /* explicit resource number */
-               zend_list_delete(Z_RESVAL_P(msql_link));
-       }
-
-       if (id!=-1 
-               || (msql_link && Z_RESVAL_P(msql_link)==msql_globals.default_link)) {
-               zend_list_delete(msql_globals.default_link);
-               msql_globals.default_link = -1;
-       }
-
-       RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool msql_select_db(string database_name [, resource link_identifier])
-   Select an mSQL database */
-PHP_FUNCTION(msql_select_db)
-{
-       zval *msql_link = NULL;
-       char *db;
-       int db_len, msql, id = -1;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-       
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlSelectDB(msql, db) == -1) {
-               RETURN_FALSE;
-       } else {
-               RETURN_TRUE;
-       }
-}
-/* }}} */
-
-/* {{{ proto bool msql_create_db(string database_name [, resource link_identifier])
-   Create an mSQL database */
-PHP_FUNCTION(msql_create_db)
-{
-       zval *msql_link = NULL;
-       char *db;
-       int id = -1, db_len, msql;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlCreateDB(msql, db) < 0) {
-               RETURN_FALSE;
-       } else {
-               RETURN_TRUE;
-       }
-}
-/* }}} */
-
-/* {{{ proto bool msql_drop_db(string database_name [, resource link_identifier])
-   Drop (delete) an mSQL database */
-PHP_FUNCTION(msql_drop_db)
-{
-       zval *msql_link = NULL;
-       char *db;
-       int id = -1, msql, db_len;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlDropDB(msql, db) < 0) {
-               RETURN_FALSE;
-       } else {
-               RETURN_TRUE;
-       }
-}
-/* }}} */
-
-/* {{{ proto resource msql_query(string query [, resource link_identifier])
-   Send an SQL query to mSQL */
-PHP_FUNCTION(msql_query)
-{
-       zval *msql_link = NULL;
-       char *query;
-       int id = -1, msql, query_len, af_rows;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &query, &query_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               id = msql_globals.default_link;
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if ((af_rows = msqlQuery(msql, query)) == -1) {
-               RETURN_FALSE;
-       }
-       ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msqlStoreResult(), af_rows), msql_globals.le_query);
-}
-/* }}} */
-
-/* {{{ proto resource msql_db_query(string database_name, string query [, resource link_identifier])
-   Send an SQL query to mSQL */
-PHP_FUNCTION(msql_db_query)
-{
-       zval *msql_link = NULL;
-       char *db, *query;
-       int db_len, query_len;
-       int id = -1;
-       int msql;
-       int af_rows;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &query, &query_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 2) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {                 
-                       RETURN_FALSE;
-               }
-       }
-               
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlSelectDB(msql, db) == -1) {
-               RETURN_FALSE;
-       }
-       
-       if ((af_rows = msqlQuery(msql, query)) == -1) {
-               RETURN_FALSE;
-       }
-       ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msqlStoreResult(), af_rows), msql_globals.le_query);
-}
-/* }}} */
-
-/* {{{ proto resource msql_list_dbs([resource link_identifier])
-   List databases available on an mSQL server */
-PHP_FUNCTION(msql_list_dbs)
-{
-       zval *msql_link = NULL;
-       int id = -1, msql;
-       m_result *msql_result;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 0) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-
-       if ((msql_result = msqlListDBs(msql)) == NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save mSQL query result");
-               RETURN_FALSE;
-       }
-       ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query);
-}
-/* }}} */
-
-/* {{{ proto resource msql_list_tables(string database_name [, resource link_identifier])
-   List tables in an mSQL database */
-PHP_FUNCTION(msql_list_tables)
-{
-       zval *msql_link = NULL;
-       char *db;
-       int id = -1, msql, db_len;
-       m_result *msql_result;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlSelectDB(msql, db) == -1) {
-               RETURN_FALSE;
-       }
-       if ((msql_result = msqlListTables(msql)) == NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save mSQL query result");
-               RETURN_FALSE;
-       }
-       ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query);
-}
-/* }}} */
-
-/* {{{ proto resource msql_list_fields(string database_name, string table_name [, resource link_identifier])
-   List mSQL result fields */
-PHP_FUNCTION(msql_list_fields)
-{
-       zval *msql_link = NULL;
-       char *db, *table;
-       int db_len, table_len, id = -1, msql;
-       m_result *msql_result;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &table, &table_len, &msql_link) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 2) {
-               id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-               
-               if (id == -1) {
-                       RETURN_FALSE;
-               }
-       }
-       
-       ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink);
-       
-       if (msqlSelectDB(msql, db) == -1) {
-               RETURN_FALSE;
-       }
-
-       if ((msql_result=msqlListFields(msql, table)) == NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save mSQL query result");
-               RETURN_FALSE;
-       }
-       ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query);
-}
-/* }}} */
-
-/* {{{ proto string msql_error(void)
-   Returns the text of the error message from previous mSQL operation */
-PHP_FUNCTION(msql_error)
-{
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
-       RETURN_STRING(msqlErrMsg,1);
-}
-/* }}} */
-
-/* {{{ proto string msql_result(resource result, int row [, mixed field])
-   Get result data */
-PHP_FUNCTION(msql_result)
-{
-       zval *result, *field = NULL;
-       long row;
-       m_result *msql_result;
-       m_query *msql_query;
-       m_row sql_row;
-       int field_offset=0;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result, &row, &field) == FAILURE) {
-               return; 
-       }
-       
-       MSQL_GET_QUERY(result);
-       
-       if (row < 0 || row >= msqlNumRows(msql_result)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on mSQL query index %ld", row, Z_RESVAL_P(result));
-               RETURN_FALSE;
-       }
-
-       msqlDataSeek(msql_result, row);
-       if ((sql_row = msqlFetchRow(msql_result)) == NULL) { /* shouldn't happen? */
-               RETURN_FALSE;
-       }
-
-       if (field) {
-               switch (Z_TYPE_P(field)) {
-                       case IS_STRING: {
-                                       int i=0;
-                                       m_field *tmp_field;
-                                       char *table_name,*field_name,*tmp;
-                                       
-                                       if ((tmp=strchr(Z_STRVAL_P(field),'.'))) {
-                                               *tmp = 0;
-                                               table_name = estrdup(Z_STRVAL_P(field));
-                                               field_name = estrdup(tmp+1);
-                                       } else {
-                                               table_name = NULL;
-                                               field_name = estrndup(Z_STRVAL_P(field), Z_STRLEN_P(field));
-                                       }
-                                       msqlFieldSeek(msql_result,0);
-                                       while ((tmp_field=msqlFetchField(msql_result))) {
-                                               if ((!table_name || !strcasecmp(tmp_field->table,table_name)) && !strcasecmp(tmp_field->name,field_name)) {
-                                                       field_offset = i;
-                                                       break;
-                                               }
-                                               i++;
-                                       }
-                                       if (!tmp_field) { /* no match found */
-                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in mSQL query index %ld",
-                                                                       (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result));
-                                               efree(field_name);
-                                               if (table_name) {
-                                                       efree(table_name);
-                                               }
-                                               RETURN_FALSE;
-                                       }
-                                       efree(field_name);
-                                       if (table_name) {
-                                               efree(table_name);
-                                       }
-                               }
-                               break;
-                       default:
-                               convert_to_long(field);
-                               field_offset = Z_LVAL_P(field);
-                               if (field_offset < 0 || field_offset >= msqlNumFields(msql_result)) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified");
-                                       RETURN_FALSE;
-                               }
-                               break;
-               }
-       }
-       
-       if (sql_row[field_offset]) {
-               Z_STRLEN_P(return_value) = (sql_row[field_offset] ? strlen(sql_row[field_offset]) : 0);
-               Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value));
-               Z_TYPE_P(return_value) = IS_STRING;
-       } else {
-               ZVAL_FALSE(return_value);
-       }
-}
-/* }}} */
-
-/* {{{ proto int msql_num_rows(resource query)
-   Get number of rows in a result */
-PHP_FUNCTION(msql_num_rows)
-{
-       zval *result;
-       m_result *msql_result;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) {
-               return;
-       }
-       
-       MSQL_GET_QUERY(result);
-       RETVAL_LONG(msql_result ? msqlNumRows(msql_result) : 0);
-}
-/* }}} */
-
-/* {{{ proto int msql_num_fields(resource query)
-   Get number of fields in a result */
-PHP_FUNCTION(msql_num_fields)
-{
-       zval *result;
-       m_result *msql_result;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result)==FAILURE) {
-               return;
-       }
-       
-       MSQL_GET_QUERY(result);
-       RETVAL_LONG(msql_result ? msqlNumFields(msql_result) : 0);
-}
-/* }}} */
-
-/* {{{ php_msql_fetch_hash
- */
-static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
-{
-       zval *result;
-       long arg2;
-       m_result *msql_result;
-       m_row msql_row;
-       m_field *msql_field;
-       m_query *msql_query;
-       int num_fields;
-       int i;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result, &arg2) == FAILURE) {
-               return;
-       }
-       
-       if (ZEND_NUM_ARGS() == 1) {
-               if (!result_type) {
-                       result_type = MSQL_BOTH;
-               }
-       } else {
-               result_type = (int) arg2;
-       }
-       
-       MSQL_GET_QUERY(result);
-       if (!msql_result || (msql_row=msqlFetchRow(msql_result)) == NULL) {
-               RETURN_FALSE;
-       }
-
-       num_fields = msqlNumFields(msql_result);
-       
-       array_init(return_value);
-       
-       msqlFieldSeek(msql_result,0);
-       for (msql_field=msqlFetchField(msql_result),i=0; msql_field; msql_field=msqlFetchField(msql_result),i++) {
-               if (msql_row[i]) {
-                       char *data;
-                       int data_len;
-                       int should_copy;
-
-                       data = msql_row[i];
-                       data_len = strlen(data);
-                       should_copy = 1;
-                       
-                       if (result_type & MSQL_NUM) {
-                               add_index_stringl(return_value, i, data, data_len, should_copy);
-                               should_copy = 1;
-                       }
-                       
-                       if (result_type & MSQL_ASSOC) {
-                               add_assoc_stringl(return_value, msql_field->name, data, data_len, should_copy);
-                       }
-               } else {
-                       /* NULL value. */
-                       if (result_type & MSQL_NUM) {
-                               add_index_null(return_value, i);
-                       }
-
-                       if (result_type & MSQL_ASSOC) {
-                               add_assoc_null(return_value, msql_field->name);
-                       }
-               }
-       }
-}
-/* }}} */
-
-/* {{{ proto array msql_fetch_row(resource query)
-   Get a result row as an enumerated array */
-PHP_FUNCTION(msql_fetch_row)
-{
-       php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSQL_NUM);
-}
-/* }}} */
-
-/* {{{ proto object msql_fetch_object(resource query [, resource result_type])
-   Fetch a result row as an object */
-PHP_FUNCTION(msql_fetch_object)
-{
-       php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-       if (Z_TYPE_P(return_value)==IS_ARRAY) {
-               object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
-       }
-}
-/* }}} */
-
-/* {{{ proto array msql_fetch_array(resource query [, int result_type])
-   Fetch a result row as an associative array */
-PHP_FUNCTION(msql_fetch_array)
-{
-       php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-}
-/* }}} */
-
-/* {{{ proto bool msql_data_seek(resource query, int row_number)
-   Move internal result pointer */
-PHP_FUNCTION(msql_data_seek)
-{
-       zval *result;
-       long offset;
-       m_result *msql_result;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset) == FAILURE) {
-               return;
-       }
-       
-       MSQL_GET_QUERY(result);
-
-       if (!msql_result ||     offset < 0 || offset >= msqlNumRows(msql_result)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is invalid for mSQL query index %ld", offset, Z_RESVAL_P(result));
-               RETURN_FALSE;
-       }
-       msqlDataSeek(msql_result, offset);
-       RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ php_msql_get_field_name
- */
-static char *php_msql_get_field_name(int field_type)
-{
-       switch (field_type) {
-#if MSQL1
-               case INT_TYPE:
-                       return "int";
-                       break;
-               case CHAR_TYPE:
-                       return "char";
-                       break;
-               case REAL_TYPE:
-                       return "real";
-                       break;
-               case IDENT_TYPE:
-                       return "ident";
-                       break;
-               case NULL_TYPE:
-                       return "null";
-                       break;
-#else
-               case INT_TYPE:
-               case UINT_TYPE:
-               case CHAR_TYPE:
-               case TEXT_TYPE:
-               case REAL_TYPE:
-               case NULL_TYPE:
-               case DATE_TYPE:
-               case TIME_TYPE:
-               case MONEY_TYPE:
-                       return msqlTypeNames[field_type];
-                       break;
-#endif
-               default:
-                       return "unknown";
-                       break;
-       }
-}
-/* }}} */
-
-/* {{{ proto object msql_fetch_field(resource query [, int field_offset])
-   Get column information from a result and return as an object */
-PHP_FUNCTION(msql_fetch_field)
-{
-       zval *result;
-       long field = 0;
-       m_result *msql_result;
-       m_field *msql_field;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result, &field)==FAILURE) {
-               return;
-       }
-       
-       MSQL_GET_QUERY(result);
-       
-       if (ZEND_NUM_ARGS() > 1) {
-               if (field < 0 || field >= msqlNumRows(msql_result)) {
-                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Bad field offset specified");
-                       RETURN_FALSE;
-               }
-               msqlFieldSeek(msql_result, field);
-       }
-       if (!msql_result || (msql_field = msqlFetchField(msql_result)) == NULL) {
-               RETURN_FALSE;
-       }
-       object_init(return_value);
-
-       add_property_string(return_value, "name",(msql_field->name?msql_field->name:""), 1);
-       add_property_string(return_value, "table",(msql_field->table?msql_field->table:""), 1);
-       add_property_long(return_value, "not_null",IS_NOT_NULL(msql_field->flags));
-#if MSQL1
-       add_property_long(return_value, "primary_key",(msql_field->flags&PRI_KEY_FLAG?1:0));
-#else
-       add_property_long(return_value, "unique",(msql_field->flags&UNIQUE_FLAG?1:0));
-#endif
-
-       add_property_string(return_value, "type",php_msql_get_field_name(Z_TYPE_P(msql_field)), 1);
-}
-/* }}} */
-
-/* {{{ proto bool msql_field_seek(resource query, int field_offset)
-   Set result pointer to a specific field offset */
-PHP_FUNCTION(msql_field_seek)
-{
-       zval *result;
-       long offset;
-       m_result *msql_result;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset) == FAILURE) {
-               return;
-       }
-       
-       MSQL_GET_QUERY(result);
-
-       if (!msql_result) {
-               RETURN_FALSE;
-       }
-       if (offset < 0 || offset >= msqlNumFields(msql_result)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %ld is invalid for mSQL query index %ld", offset, Z_RESVAL_P(result));
-               RETURN_FALSE;
-       }
-       msqlFieldSeek(msql_result, offset);
-       RETURN_TRUE;
-}
-/* }}} */
-
-#define PHP_MSQL_FIELD_NAME 1
-#define PHP_MSQL_FIELD_TABLE 2
-#define PHP_MSQL_FIELD_LEN 3
-#define PHP_MSQL_FIELD_TYPE 4
-#define PHP_MSQL_FIELD_FLAGS 5
-
-/* {{{ php_msql_field_info
- */
-static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
-{
-       zval *result;
-       long field;
-       m_result *msql_result;
-       m_field *msql_field;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &field) == FAILURE) {
-               return;
-       }
-
-       MSQL_GET_QUERY(result);
-       if(!msql_result) {
-               RETURN_FALSE;
-       }
-
-       if (field < 0 || field >= msqlNumFields(msql_result)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for mSQL query index %ld", field, Z_RESVAL_P(result));
-               RETURN_FALSE;
-       }
-       msqlFieldSeek(msql_result, field);
-       if ((msql_field = msqlFetchField(msql_result)) == NULL) {
-               RETURN_FALSE;
-       }
-       
-       switch (entry_type) {
-               case PHP_MSQL_FIELD_NAME:
-                       Z_STRLEN_P(return_value) = strlen(msql_field->name);
-                       Z_STRVAL_P(return_value) = estrndup(msql_field->name,Z_STRLEN_P(return_value));
-                       Z_TYPE_P(return_value) = IS_STRING;
-                       break;
-               case PHP_MSQL_FIELD_TABLE:
-                       Z_STRLEN_P(return_value) = strlen(msql_field->table);
-                       Z_STRVAL_P(return_value) = estrndup(msql_field->table,Z_STRLEN_P(return_value));
-                       Z_TYPE_P(return_value) = IS_STRING;
-                       break;
-               case PHP_MSQL_FIELD_LEN:
-                       Z_LVAL_P(return_value) = msql_field->length;
-                       Z_TYPE_P(return_value) = IS_LONG;
-                       break;
-               case PHP_MSQL_FIELD_TYPE:
-                       Z_STRVAL_P(return_value) = estrdup(php_msql_get_field_name(Z_TYPE_P(msql_field)));
-                       Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-                       Z_TYPE_P(return_value) = IS_STRING;
-                       break;
-               case PHP_MSQL_FIELD_FLAGS:
-#if MSQL1
-                       if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&PRI_KEY_FLAG)) {
-                               Z_STRVAL_P(return_value) = estrndup("primary key not null",20);
-                               Z_STRLEN_P(return_value) = 20;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else if (msql_field->flags&NOT_NULL_FLAG) {
-                               Z_STRVAL_P(return_value) = estrndup("not null",8);
-                               Z_STRLEN_P(return_value) = 8;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else if (msql_field->flags&PRI_KEY_FLAG) {
-                               Z_STRVAL_P(return_value) = estrndup("primary key",11);
-                               Z_STRLEN_P(return_value) = 11;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else {
-                               ZVAL_FALSE(return_value);
-                       }
-#else
-                       if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&UNIQUE_FLAG)) {
-                               Z_STRVAL_P(return_value) = estrndup("unique not null",15);
-                               Z_STRLEN_P(return_value) = 15;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else if (msql_field->flags&NOT_NULL_FLAG) {
-                               Z_STRVAL_P(return_value) = estrndup("not null",8);
-                               Z_STRLEN_P(return_value) = 8;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else if (msql_field->flags&UNIQUE_FLAG) {
-                               Z_STRVAL_P(return_value) = estrndup("unique",6);
-                               Z_STRLEN_P(return_value) = 6;
-                               Z_TYPE_P(return_value) = IS_STRING;
-                       } else {
-                               ZVAL_FALSE(return_value);
-                       }
-#endif
-                       break;
-               default:
-                       RETURN_FALSE;
-       }
-}
-/* }}} */
-
-/* {{{ proto string msql_field_name(resource query, int field_index)
-   Get the name of the specified field in a result */
-PHP_FUNCTION(msql_field_name)
-{
-       php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_NAME);
-}
-/* }}} */
-
-/* {{{ proto string msql_field_table(resource query, int field_offset)
-   Get name of the table the specified field is in */
-PHP_FUNCTION(msql_field_table)
-{
-       php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_TABLE);
-}
-/* }}} */
-
-/* {{{ proto int msql_field_len(int query, int field_offet)
-   Returns the length of the specified field */
-PHP_FUNCTION(msql_field_len)
-{
-       php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_LEN);
-}
-/* }}} */
-
-/* {{{ proto string msql_field_type(resource query, int field_offset)
-   Get the type of the specified field in a result */
-PHP_FUNCTION(msql_field_type)
-{
-       php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_TYPE);
-}
-/* }}} */
-
-/* {{{ proto string msql_field_flags(resource query, int field_offset)
-   Get the flags associated with the specified field in a result */
-PHP_FUNCTION(msql_field_flags)
-{
-       php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_FLAGS);
-}
-/* }}} */
-
-/* {{{ proto bool msql_free_result(resource query)
-   Free result memory */
-PHP_FUNCTION(msql_free_result)
-{
-       zval *result;
-       m_result *msql_result;
-       m_query *msql_query;
-       
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) {
-               return;
-       }
-
-       MSQL_GET_QUERY(result);
-       zend_list_delete(Z_LVAL_P(result));
-       RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int msql_affected_rows(resource query)
-   Return number of affected rows */
-PHP_FUNCTION(msql_affected_rows) 
-{
-       zval *result;
-       m_result *msql_result;
-       m_query *msql_query;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) {
-               return;
-       }
-
-       MSQL_GET_QUERY(result);
-       RETVAL_LONG(msql_query->af_rows);
-}
-/* }}} */
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/msql/php_msql.h b/ext/msql/php_msql.h
deleted file mode 100644 (file)
index c3af986..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.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: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_MSQL_H
-#define PHP_MSQL_H
-
-#if HAVE_MSQL
-
-extern zend_module_entry msql_module_entry;
-#define msql_module_ptr &msql_module_entry
-
-/* mSQL functions */
-PHP_MINIT_FUNCTION(msql);
-PHP_RINIT_FUNCTION(msql);
-PHP_MSHUTDOWN_FUNCTION(msql);
-PHP_MINFO_FUNCTION(msql);
-
-PHP_FUNCTION(msql_connect);
-PHP_FUNCTION(msql_pconnect);
-PHP_FUNCTION(msql_close);
-PHP_FUNCTION(msql_select_db);
-PHP_FUNCTION(msql_create_db);
-PHP_FUNCTION(msql_drop_db);
-PHP_FUNCTION(msql_list_dbs);
-PHP_FUNCTION(msql_list_tables);
-PHP_FUNCTION(msql_list_fields);
-PHP_FUNCTION(msql_error);
-PHP_FUNCTION(msql_affected_rows);
-PHP_FUNCTION(msql_query);
-PHP_FUNCTION(msql_db_query);
-PHP_FUNCTION(msql_result);
-PHP_FUNCTION(msql_num_rows);
-PHP_FUNCTION(msql_num_fields);
-PHP_FUNCTION(msql_fetch_row);
-PHP_FUNCTION(msql_data_seek);
-PHP_FUNCTION(msql_fetch_field);
-PHP_FUNCTION(msql_field_seek);
-PHP_FUNCTION(msql_free_result);
-PHP_FUNCTION(msql_field_name);
-PHP_FUNCTION(msql_field_table);
-PHP_FUNCTION(msql_field_len);
-PHP_FUNCTION(msql_field_type);
-PHP_FUNCTION(msql_field_flags);
-PHP_FUNCTION(msql_fetch_array);
-PHP_FUNCTION(msql_fetch_object);
-
-typedef struct {
-       long default_link;
-       long num_links,num_persistent;
-       long max_links,max_persistent;
-       long allow_persistent;
-       int le_query;
-       int le_link;
-       int le_plink;
-} php_msql_globals;
-
-#else
-
-#define msql_module_ptr NULL
-
-#endif
-
-#define phpext_msql_ptr msql_module_ptr
-
-#endif /* PHP_MSQL_H */