Removed:
trunk/setup/MYODBCSetupWriteConnectStr.c
Modified:
trunk/setup/Makefile.am
Log:
Remove unused file (grr).
Deleted: trunk/setup/MYODBCSetupWriteConnectStr.c
===================================================================
--- trunk/setup/MYODBCSetupWriteConnectStr.c 2007-06-19 14:07:00 UTC (rev 522)
+++ trunk/setup/MYODBCSetupWriteConnectStr.c 2007-06-19 19:42:50 UTC (rev 523)
@@ -1,145 +0,0 @@
-/* Copyright (C) 2000-2005 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- There are special exceptions to the terms and conditions of the GPL as it
- is applied to this software. View the full text of the exception in file
- EXCEPTIONS in the directory of this software distribution.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#include "MYODBCSetup.h"
-
-/*!
- \brief Formulates a connection string reflecting any user modifications.
-
- The string can be used to pass back to SQLDriverConnect.
-*/
-BOOL MYODBCSetupWriteConnectStr( MYODBC_DATASOURCE *pDataSource, char *pszStr,
SQLSMALLINT nMaxLen )
-{
- int nIndex = 0;
-
- *pszStr = '\0';
-
- if ( pDataSource->pszDATABASE )
- {
- if ( !MYODBCSetupInsertStr( pszStr, "DATABASE=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszDATABASE, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszDESCRIPTION )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "DESCRIPTION=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszDATABASE, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszDRIVER )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "DRIVER=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszDRIVER, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszDSN )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "DSN=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszDSN, nMaxLen, &nIndex
) )
- return FALSE;
- }
-
- if ( pDataSource->pszOPTION )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "OPTION=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszOPTION, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszPASSWORD )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "PWD=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszPASSWORD, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszPORT )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "PORT=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszPORT, nMaxLen, &nIndex
) )
- return FALSE;
- }
-
- if ( pDataSource->pszSERVER )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "SERVER=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszSERVER, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszSOCKET )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "SOCKET=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszSOCKET, nMaxLen,
&nIndex ) )
- return FALSE;
- }
-
- if ( pDataSource->pszSTMT )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "STMT=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszSTMT, nMaxLen, &nIndex
) )
- return FALSE;
- }
-
- if ( pDataSource->pszUSER )
- {
- if ( nIndex && !MYODBCSetupInsertStr( pszStr, ";", nMaxLen, &nIndex )
)
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, "UID=", nMaxLen, &nIndex ) )
- return FALSE;
- if ( !MYODBCSetupInsertStr( pszStr, pDataSource->pszUSER, nMaxLen, &nIndex
) )
- return FALSE;
- }
-
- return TRUE;
-}
-
-
Modified: trunk/setup/Makefile.am
===================================================================
--- trunk/setup/Makefile.am 2007-06-19 14:07:00 UTC (rev 522)
+++ trunk/setup/Makefile.am 2007-06-19 19:42:50 UTC (rev 523)
@@ -162,5 +162,4 @@
TopImage.xpm \
MySQL-16.xpm \
setup.pro \
- myodbc3S.rc \
- MYODBCSetupWriteConnectStr.c
+ myodbc3S.rc
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r523 - trunk/setup | jwinstead | 19 Jun |
