2010-02-27 10:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbsqlit3/hbsqlit3.c % Deleted unnecessary cast. * contrib/rddsql/sddmy/Makefile - contrib/rddsql/sddmy/mysqldd.c + contrib/rddsql/sddmy/sddmy.c * contrib/rddsql/sddpg/Makefile - contrib/rddsql/sddpg/pgsqldd.c + contrib/rddsql/sddpg/sddpg.c * contrib/rddsql/sddfb/Makefile - contrib/rddsql/sddfb/fbirddd.c + contrib/rddsql/sddfb/sddfb.c * contrib/rddsql/sddodbc/Makefile - contrib/rddsql/sddodbc/odbcdd.c + contrib/rddsql/sddodbc/sddodbc.c * contrib/rddsql/sddoci/Makefile - contrib/rddsql/sddoci/ocidd.c + contrib/rddsql/sddoci/sddoci.c * Renamed source files. ! Deleted leftover trace msg from sddoci.
2010-02-27 09:06:23 +00:00
parent 36fecf2567
commit f66ee12e71
12 changed files with 58 additions and 34 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,12 +17,34 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2010-02-27 10:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbsqlit3/hbsqlit3.c
+    % Deleted unnecessary cast.
+
+  * contrib/rddsql/sddmy/Makefile
+  - contrib/rddsql/sddmy/mysqldd.c
+  + contrib/rddsql/sddmy/sddmy.c
+  * contrib/rddsql/sddpg/Makefile
+  - contrib/rddsql/sddpg/pgsqldd.c
+  + contrib/rddsql/sddpg/sddpg.c
+  * contrib/rddsql/sddfb/Makefile
+  - contrib/rddsql/sddfb/fbirddd.c
+  + contrib/rddsql/sddfb/sddfb.c
+  * contrib/rddsql/sddodbc/Makefile
+  - contrib/rddsql/sddodbc/odbcdd.c
+  + contrib/rddsql/sddodbc/sddodbc.c
+  * contrib/rddsql/sddoci/Makefile
+  - contrib/rddsql/sddoci/ocidd.c
+  + contrib/rddsql/sddoci/sddoci.c
+    * Renamed source files.
+    ! Deleted leftover trace msg from sddoci.
+
 2010-02-26 20:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbide/ideeditor.prg
  * contrib/hbide/ideharbourhelp.prg
    + Implemented: auto activating and displaying the function's documentation
-      you have currently finished typing opening brace. This feature 
-      is activated only when you have initialized the documentation 
+      you have currently finished typing opening brace. This feature
+      is activated only when you have initialized the documentation
      browser by clicking on the "H" icon on the right toolbar.

      I am open to hear what other features can be implemented in this context.
@@ -36,10 +58,10 @@
    ! A nasty fix.

  * contrib/hbide/ideharbourhelp.prg
-    + Implemented: text file viewer "as is" if it does not contain 
+    + Implemented: text file viewer "as is" if it does not contain
      any function's documentation. In Harbour's /doc* tree
      there are many files without NANFORUM tags.
-      
+
 2010-02-26 16:54 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbide/resources/docviewgenerator.ui
  * contrib/hbide/resources/docviewgenerator.uic
@@ -48,18 +70,18 @@
      horizontal divider.

  * doc/hdr_tpl.txt
-    ! Little correction in exact number of spaces and little 
+    ! Little correction in exact number of spaces and little
      more awareness tip for writer.

  * contrib/hbide/ideharbourhelp.prg
  * contrib/hbide/idemisc.prg
    ! More refinements the way Harbour document is displayed.
      Please forward your suggessions.
-    ! Presentation: documents tree is now exact syncronization with 
+    ! Presentation: documents tree is now exact syncronization with
      Harbour's folder structure but depicting only those folders
      with /doc and /doc/en endingings.
    + Enabled: to reload the tree on the fly. Marco, check it.
-   
+
 2010-02-26 23:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * src/rtl/tget.prg
  * tests/rto_get.prg
--- a/harbour/contrib/hbsqlit3/hbsqlit3.c
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.c
@@ -607,7 +607,7 @@ HB_FUNC( SQLITE3_OPEN )
   char     *pszFree;
   const char *pszdbName = hb_fsNameConv( hb_parcx(1), &pszFree );

-   if( hb_fsFileExists(( const char * ) pszdbName) || hb_parl(2) )
+   if( hb_fsFileExists( pszdbName) || hb_parl(2) )
   {
      if( sqlite3_open(pszdbName, &db) == SQLITE_OK )
      {
--- a/harbour/contrib/rddsql/sddfb/Makefile
+++ b/harbour/contrib/rddsql/sddfb/Makefile
@@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := sddfb

 C_SOURCES := \
-   fbirddd.c \
+   sddfb.c \

 _DET_DSP_NAME := firebird
 _DET_VAR_INC_ := HB_INC_FIREBIRD
--- a/harbour/contrib/rddsql/sddfb/fbirddd.c
+++ b/harbour/contrib/rddsql/sddfb/fbirddd.c
--- a/harbour/contrib/rddsql/sddmy/Makefile
+++ b/harbour/contrib/rddsql/sddmy/Makefile
@@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := sddmy

 C_SOURCES := \
-   mysqldd.c \
+   sddmy.c \

 _DET_DSP_NAME := mysql
 _DET_VAR_INC_ := HB_INC_MYSQL
--- a/harbour/contrib/rddsql/sddmy/mysqldd.c
+++ b/harbour/contrib/rddsql/sddmy/mysqldd.c
--- a/harbour/contrib/rddsql/sddoci/Makefile
+++ b/harbour/contrib/rddsql/sddoci/Makefile
@@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := sddoci

 C_SOURCES := \
-   ocidd.c \
+   sddoci.c \

 _DET_DSP_NAME := ocilib
 _DET_VAR_INC_ := HB_INC_OCILIB
--- a/harbour/contrib/rddsql/sddoci/sddoci.c
+++ b/harbour/contrib/rddsql/sddoci/sddoci.c
@@ -151,8 +151,6 @@ static void hb_ocidd_exit( void * cargo )
   HB_SYMBOL_UNUSED( cargo );

   OCI_Cleanup();
-
-printf( "CLEANUP!\n" );
 }

 HB_FUNC( SDDOCI ) {;}
@@ -215,26 +213,30 @@ static char * ocilibGetError( HB_ERRCODE * pErrCode )

 static HB_ERRCODE ocilibConnect( SQLDDCONNECTION * pConnection, PHB_ITEM pItem )
 {
-   OCI_Connection * cn;
-
-   mtext * szConn = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 2 ) );
-   mtext * szUser = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 3 ) );
-   mtext * szPass = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 4 ) );
-
-   cn = OCI_ConnectionCreate( szConn, szUser, szPass, OCI_SESSION_DEFAULT );
-
-   HB_MTEXT_FREE( szConn );
-   HB_MTEXT_FREE( szUser );
-   HB_MTEXT_FREE( szPass );
-
-   if( cn )
+   if( hb_arrayGetCPtr( pItem, 2 ) &&
+       hb_arrayGetCPtr( pItem, 3 ) &&
+       hb_arrayGetCPtr( pItem, 4 ) )
   {
-      pConnection->hConnection = ( void * ) cn;
-      return HB_SUCCESS;
-   }
-   else
-      pConnection->hConnection = NULL;
+      OCI_Connection * cn;

+      mtext * szConn = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 2 ) );
+      mtext * szUser = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 3 ) );
+      mtext * szPass = ( mtext * ) HB_MTEXT_CONVTO( hb_arrayGetCPtr( pItem, 4 ) );
+
+      cn = OCI_ConnectionCreate( szConn, szUser, szPass, OCI_SESSION_DEFAULT );
+
+      HB_MTEXT_FREE( szConn );
+      HB_MTEXT_FREE( szUser );
+      HB_MTEXT_FREE( szPass );
+
+      if( cn )
+      {
+         pConnection->hConnection = ( void * ) cn;
+         return HB_SUCCESS;
+      }
+   }
+
+   pConnection->hConnection = NULL;
   return HB_FAILURE;
 }

@@ -513,7 +515,7 @@ static HB_ERRCODE ocilibGoTo( SQLBASEAREAP pArea, HB_ULONG ulRecNo )
      }

      pArray = hb_itemArrayNew( pArea->area.uiFieldCount );
-      for( ui = 1; ui <= pArea->area.uiFieldCount; ui++ )
+      for( ui = 1; ui <= pArea->area.uiFieldCount; ++ui )
      {
         pItem = NULL;

--- a/harbour/contrib/rddsql/sddodbc/Makefile
+++ b/harbour/contrib/rddsql/sddodbc/Makefile
@@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := sddodbc

 C_SOURCES := \
-   odbcdd.c \
+   sddodbc.c \

 ifneq ($(filter $(HB_PLATFORM),win wce),)
   HB_INC_ODBC := force
--- a/harbour/contrib/rddsql/sddodbc/sddodbc.c
+++ b/harbour/contrib/rddsql/sddodbc/sddodbc.c
--- a/harbour/contrib/rddsql/sddpg/Makefile
+++ b/harbour/contrib/rddsql/sddpg/Makefile
@@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := sddpg

 C_SOURCES := \
-   pgsqldd.c \
+   sddpg.c \

 _DET_DSP_NAME := postgresql
 _DET_VAR_INC_ := HB_INC_PGSQL
--- a/harbour/contrib/rddsql/sddpg/pgsqldd.c
+++ b/harbour/contrib/rddsql/sddpg/pgsqldd.c