From 292dd19552ddeb80e8f7f24a1c742591e9aec347 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Nov 2007 15:05:43 +0000 Subject: [PATCH] 2007-11-11 16:05 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/xhb/hbcompat.ch + Added extended At() translation to hb_At() * contrib/tip/ftpcln.prg ! Changed extended At() to hb_At(). (Thanks Petr) --- harbour/ChangeLog | 7 +++++++ harbour/contrib/tip/ftpcln.prg | 18 +++++++++--------- harbour/contrib/xhb/hbcompat.ch | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 693189ec2f..728e0c88bb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-11 16:05 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/xhb/hbcompat.ch + + Added extended At() translation to hb_At() + + * contrib/tip/ftpcln.prg + ! Changed extended At() to hb_At(). (Thanks Petr) + 2007-11-11 14:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/rdd_ads/make_b32.bat * contrib/rdd_ads/make_vc.bat diff --git a/harbour/contrib/tip/ftpcln.prg b/harbour/contrib/tip/ftpcln.prg index c13042e0d3..47f2d42451 100644 --- a/harbour/contrib/tip/ftpcln.prg +++ b/harbour/contrib/tip/ftpcln.prg @@ -821,13 +821,13 @@ METHOD listFiles( cFileSpec ) CLASS tIPClientFTP IF Empty( cEntry ) //PM:09-08-2007 Needed because of the new HB_aTokens() - HB_ADel(aList, cEntry:__enumIndex(), .T.) + hb_ADel(aList, cEntry:__enumIndex(), .T.) ELSE aFile := Array( F_LEN+3 ) nStart := 1 - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) // file permissions (attributes) aFile[F_ATTR] := SubStr( cEntry, nStart, nEnd-nStart ) @@ -835,44 +835,44 @@ METHOD listFiles( cFileSpec ) CLASS tIPClientFTP // # of links DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) aFile[F_LEN+1]:= Val( SubStr( cEntry, nStart, nEnd-nStart ) ) nStart := nEnd // owner name DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) aFile[F_LEN+2]:= SubStr( cEntry, nStart, nEnd-nStart ) nStart := nEnd // group name DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) aFile[F_LEN+3]:= SubStr( cEntry, nStart, nEnd-nStart ) nStart := nEnd // file size DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) aFile[F_SIZE] := Val( SubStr( cEntry, nStart, nEnd-nStart ) ) nStart := nEnd // Month DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) cMonth := SubStr( cEntry, nStart, nEnd-nStart ) cMonth := PadL( AScan( aMonth, cMonth ), 2, "0" ) nStart := nEnd // Day DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) cDay := SubStr( cEntry, nStart, nEnd-nStart ) nStart := nEnd // year DO WHILE SubStr( cEntry, ++nStart, 1 ) == " " ; ENDDO - nEnd := At( Chr(32), cEntry, nStart ) + nEnd := hb_At( Chr(32), cEntry, nStart ) cYear := SubStr( cEntry, nStart, nEnd-nStart ) nStart := nEnd diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 640a8f5b2a..f755ffadad 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -135,6 +135,7 @@ #xtranslate RAScan([]) => hb_RAScan() #xtranslate AIns(,,[]) => hb_AIns(,,) #xtranslate ADel(,,) => hb_ADel(,,) + #xtranslate At(,,[]) => hb_At(,,) #xtranslate ISPOINTER( ) => hb_ISPOINTER( )