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

2008-05-31 15:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/rddads/adsfunc.c
   * contrib/rddads/ads1.c
     ! Replaced AdsShowError() calls with HB_TRACE() ones.
       DEBUG guards removed.
     ! Minor fixes in HB_TRACE messages.

   * contrib/rddads/adsmgmnt.c
     * Minor formatting.

   * contrib/hbcurl/hbcurl.c
   * contrib/hbcurl/tests/ftp_uldl.prg
     * Minor changes.
This commit is contained in:
Viktor Szakats
2008-05-31 13:43:44 +00:00
parent 2a89109763
commit 181d980539
6 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
harbour/ChangeLog
View File

@@ -8,6 +8,33 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-31 15:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
! Replaced AdsShowError() calls with HB_TRACE() ones.
DEBUG guards removed.
! Minor fixes in HB_TRACE messages.
* contrib/rddads/adsmgmnt.c
* Minor formatting.
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/tests/ftp_uldl.prg
* Minor changes.
2008-05-31 15:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/tests/ftp_uldl.prg
* Minor changes.
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
! Replaced AdsShowError() calls with HB_TRACE() ones.
DEBUG guards removed.
* contrib/rddads/adsmgmnt.c
* Minor formatting.
2008-05-31 14:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbmacro.ch
* harbour/source/vm/macro.c

27
harbour/contrib/hbcurl/hbcurl.c
View File

@@ -689,19 +689,6 @@ HB_FUNC( CURL_EASY_SETOPT )
res = curl_easy_setopt( pConn->curl, CURLOPT_COOKIELIST, hb_parcx( 3 ) );
break;
case HB_CURLOPT_HTTPHEADER:
{
PHB_ITEM pHttpHeaders = hb_param( 3, HB_IT_ARRAY );
ULONG ulPos;
ULONG ulArrayPos = hb_arrayLen( pHttpHeaders );
for( ulPos = 0; ulPos < ulArrayPos; ulPos++ )
curl_slist_append( pConn->sHttpHeader, hb_arrayGetCPtr( pHttpHeaders, ulPos + 1 ) );
res = curl_easy_setopt( pConn->curl, CURLOPT_HTTPHEADER, pConn->sHttpHeader );
}
break;
case HB_CURLOPT_HTTPPOST:
{
PHB_ITEM pHttpPost = hb_param( 3, HB_IT_ARRAY );
@@ -718,10 +705,24 @@ HB_FUNC( CURL_EASY_SETOPT )
CURLFORM_FILE, hb_arrayGetCPtr( pArray, 2 ),
CURLFORM_END );
}
res = curl_easy_setopt( pConn->curl, CURLOPT_HTTPPOST, pConn->sHttpPostf );
}
break;
case HB_CURLOPT_HTTPHEADER:
{
PHB_ITEM pHttpHeaders = hb_param( 3, HB_IT_ARRAY );
ULONG ulPos;
ULONG ulArrayPos = hb_arrayLen( pHttpHeaders );
for( ulPos = 0; ulPos < ulArrayPos; ulPos++ )
curl_slist_append( pConn->sHttpHeader, hb_arrayGetCPtr( pHttpHeaders, ulPos + 1 ) );
res = curl_easy_setopt( pConn->curl, CURLOPT_HTTPHEADER, pConn->sHttpHeader );
}
break;
case HB_CURLOPT_QUOTE:
{
PHB_ITEM pHttpHeaders = hb_param( 3, HB_IT_ARRAY );

14
harbour/contrib/hbcurl/tests/ftp_uldl.prg
View File

@@ -6,12 +6,14 @@
#include "hbcurl.ch"
#include "common.ch"
#define LOCAL_FILE "ftp_uldl.prg"
#define UPLOAD_FILE_AS "ftp_upped.prg"
#define REMOTE_URL "ftp://harbour:power@localhost/" + UPLOAD_FILE_AS
#define RENAME_FILE_TO "ftp_upped_renamed.prg"
FUNCTION Main()
FUNCTION Main( cDL )
LOCAL curl
? "INIT:", curl_global_init()
@@ -21,11 +23,11 @@ FUNCTION Main()
? curl_easy_setopt( curl, HB_CURLOPT_UPLOAD )
? curl_easy_setopt( curl, HB_CURLOPT_URL, REMOTE_URL )
? curl_easy_setopt( curl, HB_CURLOPT_SETUPLOADFILE, LOCAL_FILE )
? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, .T. )
? curl_easy_setopt( curl, HB_CURLOPT_USERPWD, "harbour:power" ) /* May use this instead of embedding in URL */
? curl_easy_setopt( curl, HB_CURLOPT_SETPROGRESS, {| nPos, nLen | DispOutAt( 10, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ) } )
? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. )
? curl_easy_setopt( curl, HB_CURLOPT_POSTQUOTE, { "RNFR " + UPLOAD_FILE_AS, "RNTO " + RENAME_FILE_TO } )
? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, .T. )
? "UPLOAD:", curl_easy_perform( curl )
@@ -36,11 +38,17 @@ FUNCTION Main()
IF ! Empty( curl := curl_easy_init() )
DEFAULT cDL TO "ftp://ftp.cisco.com/README"
/* Now let's download something */
? curl_easy_setopt( curl, HB_CURLOPT_DOWNLOAD )
? curl_easy_setopt( curl, HB_CURLOPT_URL, "ftp://ftp.cisco.com/README" )
? curl_easy_setopt( curl, HB_CURLOPT_URL, cDL )
? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYPEER, .F. )
? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYHOST, .F. )
? curl_easy_setopt( curl, HB_CURLOPT_SETDOWNLOADFILE, "test_dl.bin" )
? curl_easy_setopt( curl, HB_CURLOPT_SETPROGRESS, {| nPos, nLen | DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ) } )
? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. )
? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, .T. )
? "DOWNLOAD:", curl_easy_perform( curl )

27
harbour/contrib/rddads/ads1.c
View File

@@ -103,7 +103,7 @@ static RDDFUNCS adsSuper;
static void adsSetListener_callback( HB_set_enum setting, HB_set_listener_enum when )
{
HB_TRACE(HB_TR_DEBUG, ("adsSetListener_callback (%d %d)", setting, when));
HB_TRACE(HB_TR_DEBUG, ("adsSetListener_callback (%d, %d)", setting, when));
if( when == HB_SET_LISTENER_AFTER ) /* we don't do anything with BEFORE calls */
{
switch( setting )
@@ -686,7 +686,7 @@ ERRCODE hb_adsCloseCursor( ADSAREAP pArea )
if( u32RetVal != AE_SUCCESS )
{
HB_TRACE(HB_TR_DEBUG, ("adsCloseTable failed (%lu, %s)", u32RetVal, pArea->szDataFileName));
HB_TRACE(HB_TR_DEBUG, ("adsCloseTable(%lu, %s) failed", u32RetVal, pArea->szDataFileName));
}
pArea->hTable = 0;
}
@@ -723,7 +723,7 @@ ERRCODE hb_adsCloseCursor( ADSAREAP pArea )
static ERRCODE adsBof( ADSAREAP pArea, BOOL * pBof )
{
HB_TRACE(HB_TR_DEBUG, ("sixBof(%p, %p)", pArea, pBof));
HB_TRACE(HB_TR_DEBUG, ("adsBof(%p, %p)", pArea, pBof));
/* resolve any pending relations */
if( pArea->lpdbPendingRel )
@@ -2318,8 +2318,11 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
bTypeError = FALSE;
ulRetVal = AdsSetDouble( pArea->hTable, ADSFIELD( uiIndex ), hb_itemGetND( pItem ) );
/* write to autoincrement field will gen error 5066
if( pField->uiTypeExtended == ADS_AUTOINC )
AdsShowError( ( UNSIGNED8 * ) "Error" ); */
#if HB_TR_LEVEL >= HB_TR_DEBUG
if( pField->uiTypeExtended == ADS_AUTOINC )
HB_TRACE(HB_TR_INFO, ("adsPutValue() error"));
#endif
*/
}
break;
@@ -2711,9 +2714,7 @@ static ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo )
if( uRetVal != AE_SUCCESS )
{
#ifdef DEBUG
AdsShowError( ( UNSIGNED8 * ) "Error" );
#endif
HB_TRACE(HB_TR_INFO, ("adsCreate() error"));
return FAILURE;
}
/*
@@ -3356,7 +3357,7 @@ static ERRCODE adsChildSync( ADSAREAP pArea, LPDBRELINFO pRelInfo )
static ERRCODE adsClearRel( ADSAREAP pArea )
{
HB_TRACE(HB_TR_DEBUG, ("adsclearRel(%p)", pArea ));
HB_TRACE(HB_TR_DEBUG, ("adsClearRel(%p)", pArea ));
SUPER_CLEARREL( ( AREAP ) pArea );
AdsClearRelation( pArea->hTable );
@@ -4488,9 +4489,7 @@ static ERRCODE adsLock( ADSAREAP pArea, LPDBLOCKINFO pLockInfo )
default :
/* This should probably throw a real error... */
#ifdef DEBUG
AdsShowError( ( UNSIGNED8 * ) "Error in pLockInfo->uiMethod" );
#endif
HB_TRACE(HB_TR_INFO, ("adsLock() error in pLockInfo->uiMethod"));
pLockInfo->fResult = FALSE;
return FAILURE;
}
@@ -4592,7 +4591,7 @@ static ERRCODE adsDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex
PHB_FNAME pFileName;
BOOL fTable = FALSE, fResult = FALSE;
HB_TRACE(HB_TR_DEBUG, ("adsDrop(%p,%p,%p,%lu)", pRDD, pItemTable, pItemIndex, ulConnect));
HB_TRACE(HB_TR_DEBUG, ("adsDrop(%p, %p, %p, %lu)", pRDD, pItemTable, pItemIndex, ulConnect));
szFile = hb_itemGetCPtr( pItemIndex );
if( !szFile[ 0 ] )
@@ -4679,7 +4678,7 @@ static ERRCODE adsExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemInd
PHB_FNAME pFileName;
BOOL fTable = FALSE;
HB_TRACE(HB_TR_DEBUG, ("adsExists(%p,%p,%p,%lu)", pRDD, pItemTable, pItemIndex, ulConnect));
HB_TRACE(HB_TR_DEBUG, ("adsExists(%p, %p, %p, %lu)", pRDD, pItemTable, pItemIndex, ulConnect));
szFile = hb_itemGetCPtr( pItemIndex );
if( !szFile[ 0 ] )

18
harbour/contrib/rddads/adsfunc.c
View File

@@ -261,9 +261,11 @@ HB_FUNC( ADSGETSERVERTIME )
hb_stornl( plTime, -1, 3 );
}
/* QUESTION: Returning NIL on error. Is this what we want? [vszakats] */
#ifdef DEBUG
#if HB_TR_LEVEL >= HB_TR_DEBUG
else
AdsShowError( ( UNSIGNED8 * ) "AdsGetServerTime() error" );
{
HB_TRACE(HB_TR_DEBUG, ("AdsGetServerTime() error"));
}
#endif
}
@@ -1239,9 +1241,7 @@ HB_FUNC( ADSEXECUTESQLDIRECT )
}
else
{
#ifdef DEBUG
AdsShowError( ( UNSIGNED8 * ) "AdsExecuteSQLDirect() error" );
#endif
HB_TRACE(HB_TR_DEBUG, ("AdsExecuteSQLDirect() error"));
hb_retl( FALSE );
}
}
@@ -1273,9 +1273,7 @@ HB_FUNC( ADSPREPARESQL )
hb_retl( TRUE );
else
{
#ifdef DEBUG
AdsShowError( ( UNSIGNED8 * ) "AdsPrepareSQL() error" );
#endif
HB_TRACE(HB_TR_DEBUG, ("AdsPrepareSQL() error"));
hb_retl( FALSE );
}
}
@@ -1317,9 +1315,7 @@ HB_FUNC( ADSEXECUTESQL )
}
else
{
#ifdef DEBUG
AdsShowError( ( UNSIGNED8 * ) "AdsExecuteSQL() error" );
#endif
HB_TRACE(HB_TR_DEBUG, ("AdsExecuteSQL() error"));
hb_retl( FALSE );
}
}

2
harbour/contrib/rddads/adsmgmnt.c
View File

@@ -119,9 +119,7 @@ HB_FUNC( ADSMGGETINSTALLINFO )
#if HB_TR_LEVEL >= HB_TR_INFO
if( usStructSize > sizeof( ADS_MGMT_INSTALL_INFO ) )
{
HB_TRACE(HB_TR_INFO, ("%s returned extra data; available with newer client lib.", "AdsMgGetInstallInfo()"));
}
#endif
}