fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-11-06 02:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/tests/wcecon.prg
    ! added missing REQUEST DBFCDX

  * harbour/contrib/rddsql/Makefile
    ! added missing include $(TOP)$(ROOT)config/lib.cf

  * harbour/contrib/rddsql/hbsqldd.h
  * harbour/contrib/rddsql/sqlbase.c
  * harbour/contrib/rddsql/mysqldd.c
    * added missing const to some char * parameters/members
    ; added note about using sizeof() in preprocesor conditional directives

  * harbour/contrib/rddsql/sqlmix.c
    ! fixed printf() format

    TOFIX for author:
	mysqldd.c:258: warning: ‘pItemEof’ may be used uninitialized in this function
	sqlbase.c:509: warning: comparison of unsigned expression < 0 is always false
    Mindaugas can you look at it?
This commit is contained in:
Przemyslaw Czerpak
2008-11-06 01:19:05 +00:00
parent 0828426008
commit 10a86fb8b0
7 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -8,6 +8,27 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-06 02:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/tests/wcecon.prg
! added missing REQUEST DBFCDX
* harbour/contrib/rddsql/Makefile
! added missing include $(TOP)$(ROOT)config/lib.cf
* harbour/contrib/rddsql/hbsqldd.h
* harbour/contrib/rddsql/sqlbase.c
* harbour/contrib/rddsql/mysqldd.c
* added missing const to some char * parameters/members
; added note about using sizeof() in preprocesor conditional directives
* harbour/contrib/rddsql/sqlmix.c
! fixed printf() format
TOFIX for author:
mysqldd.c:258: warning: ‘pItemEof’ may be used uninitialized in this function
sqlbase.c:509: warning: comparison of unsigned expression < 0 is always false
Mindaugas can you look at it?
2008-11-05 23:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_vc.bat
* contrib/hbgt/doc/gendoc.bat

1
harbour/contrib/rddsql/Makefile
View File

@@ -23,6 +23,7 @@ C_SOURCES=\
sqlbase.c \
sqlmix.c \
include $(TOP)$(ROOT)config/lib.cf
else
include $(TOP)$(ROOT)config/none.cf
endif

2
harbour/contrib/rddsql/hbsqldd.h
View File

@@ -323,7 +323,7 @@ typedef struct _SDDNODE
{
struct _SDDNODE * pNext;
char* Name;
const char* Name;
SDDFUNC_CONNECT Connect;
SDDFUNC_DISCONNECT Disconnect;
SDDFUNC_EXECUTE Execute;

14
harbour/contrib/rddsql/mysqldd.c
View File

@@ -63,7 +63,15 @@ typedef int my_socket;
#include "mysql.h"
/* TOFIX: HACK to make it compile under MSVC to avoid 'invalid integer constant expression' errors. */
#if !defined( _MSC_VER ) && !defined( __MINGW32__ )
/* sizeof() inside #if will not work with any C compiler which has
* preprocessor separated from compiler so it will not work with most of
* existing C compilers. To make it working is necessary to mix preprocessor
* and compiler logic so sizeof() for newly defined types by 'typedef' will
* work. It's rather seldom situation when C compiler authors make sth like
* that.
*/
#if defined( __BORLANDC__ )
#if sizeof( MYSQL_ROW_OFFSET ) != sizeof( void* )
#error "MySQLDD error: sizeof( MYSQL_ROW_OFFSET ) != sizeof( void* )"
@@ -132,7 +140,7 @@ HB_FUNC( MYSQLDD ) {;}
HB_INIT_SYMBOLS_BEGIN( mysqldd__InitSymbols )
{ "MYSQLDD", HB_FS_PUBLIC, HB_FUNCNAME( MYSQLDD ), NULL },
{ "MYSQLDD", {HB_FS_PUBLIC}, {HB_FUNCNAME( MYSQLDD )}, NULL },
HB_INIT_SYMBOLS_END( mysqldd__InitSymbols )
HB_CALL_ON_STARTUP_BEGIN( _hb_mysqldd_init_ )
@@ -154,7 +162,7 @@ HB_CALL_ON_STARTUP_END( _hb_mysqldd_init_ )
/*=====================================================================================*/
static USHORT hb_errRT_MySQLDD( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiOsCode )
static USHORT hb_errRT_MySQLDD( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOsCode )
{
USHORT uiAction;
PHB_ITEM pError;

6
harbour/contrib/rddsql/sqlbase.c
View File

@@ -94,7 +94,7 @@ static ULONG s_ulConnectionCurrent = 0;
static RDDFUNCS sqlbaseSuper;
static ERRCODE hb_errRT_SQLBASE( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation )
static ERRCODE hb_errRT_SQLBASE( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation )
{
PHB_ITEM pError;
ERRCODE iRet = FAILURE;
@@ -1132,8 +1132,8 @@ HB_FUNC( SQLBASE_GETFUNCTABLE )
HB_INIT_SYMBOLS_BEGIN( sqlbase1__InitSymbols )
{ "SQLBASE", HB_FS_PUBLIC, HB_FUNCNAME( SQLBASE ), NULL },
{ "SQLBASE_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( SQLBASE_GETFUNCTABLE ), NULL }
{ "SQLBASE", {HB_FS_PUBLIC}, {HB_FUNCNAME( SQLBASE )}, NULL },
{ "SQLBASE_GETFUNCTABLE", {HB_FS_PUBLIC}, {HB_FUNCNAME( SQLBASE_GETFUNCTABLE )}, NULL }
HB_INIT_SYMBOLS_END( sqlbase1__InitSymbols )
HB_CALL_ON_STARTUP_BEGIN( _hb_sqlbase_init_ )

2
harbour/contrib/rddsql/sqlmix.c
View File

@@ -388,7 +388,7 @@ static void hb_mixTagPrintNode( PMIXTAG pTag, PMIXNODE pNode, int iLevel )
hb_mixTagPrintNode( pTag, pNode->Child[ i ], iLevel + 1 );
}
printf("%*d %*s\n", iLevel * 10 + 5, MIX_KEY( pTag, pNode, i )->rec, pTag->uiKeyLen,
printf("%*ld %*s\n", iLevel * 10 + 5, MIX_KEY( pTag, pNode, i )->rec, pTag->uiKeyLen,
MIX_KEY( pTag, pNode, i )->notnul ? ( char * ) MIX_KEY( pTag, pNode, i )->val : "NULL" );
}

2
harbour/tests/wcecon.prg
View File

@@ -13,6 +13,8 @@
#include "hbgtinfo.ch"
request DBFCDX
proc main()
field F1, F2, FX