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

2010-01-14 13:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbdefs.h
    + Added HB_FATTR type to represent file attribute (mapped to unsigned long).

  * src/common/hbffind.c
  * src/rtl/fstemp.c
  * src/rtl/filesys.c
  * src/rtl/spfiles.c
  * src/rtl/philes.c
  * src/rtl/filebuf.c
  * include/hbapifs.h
  * contrib/hbct/files.c
    + ULONG -> HB_FATTR

  * contrib/hbct/charsprd.c
  * contrib/hbct/misc2.c
  * contrib/hbct/blank.c
  * contrib/hbct/disk.c
  * contrib/hbct/dattime2.c
  * contrib/hbct/expand.c
    + ULONG -> HB_SIZE

  * include/hbapifs.h
  * contrib/xhb/xhb.h
    + ULONG -> HB_SIZE (missed from prev)
This commit is contained in:
Viktor Szakats
2010-01-14 12:24:57 +00:00
parent d2374b5357
commit f6a805264e
17 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
harbour/ChangeLog
View File

@@ -17,6 +17,32 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-14 13:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbdefs.h
+ Added HB_FATTR type to represent file attribute (mapped to unsigned long).
* src/common/hbffind.c
* src/rtl/fstemp.c
* src/rtl/filesys.c
* src/rtl/spfiles.c
* src/rtl/philes.c
* src/rtl/filebuf.c
* include/hbapifs.h
* contrib/hbct/files.c
+ ULONG -> HB_FATTR
* contrib/hbct/charsprd.c
* contrib/hbct/misc2.c
* contrib/hbct/blank.c
* contrib/hbct/disk.c
* contrib/hbct/dattime2.c
* contrib/hbct/expand.c
+ ULONG -> HB_SIZE
* include/hbapifs.h
* contrib/xhb/xhb.h
+ ULONG -> HB_SIZE (missed from prev)
2010-01-14 12:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbpp.h
* harbour/src/pp/ppcore.c

2
harbour/contrib/hbct/blank.c
View File

@@ -86,7 +86,7 @@ HB_FUNC( BLANK )
if( pMode && hb_itemGetL( pMode ) )
{
ULONG lLen = hb_itemGetCLen( pItem );
HB_SIZE lLen = hb_itemGetCLen( pItem );
char * szResult = ( char * ) hb_xgrab( lLen + 1 );
hb_xmemset( szResult, ' ', lLen );

8
harbour/contrib/hbct/charsprd.c
View File

@@ -56,7 +56,7 @@
HB_FUNC( CHARSPREAD )
{
ULONG ulLen = hb_parclen( 1 );
HB_SIZE ulLen = hb_parclen( 1 );
if( ulLen == 0 )
hb_retc_null();
@@ -64,14 +64,14 @@ HB_FUNC( CHARSPREAD )
{
long lSize = hb_parnl( 2 );
if( lSize < 0 || ( ULONG ) lSize <= ulLen )
if( lSize < 0 || ( HB_SIZE ) lSize <= ulLen )
hb_itemReturn( hb_param( 1, HB_IT_ANY ) );
else
{
const char * szText = hb_parc( 1 );
char * szDest, cDelim = ' ';
int iTokens = 0, iRepl, iRest, iFirst, i;
ULONG ul, ulDst, ulRest;
HB_SIZE ul, ulDst, ulRest;
if( HB_ISCHAR( 3 ) )
cDelim = hb_parc( 3 )[0];
@@ -93,7 +93,7 @@ HB_FUNC( CHARSPREAD )
}
else
{
ulRest = ( ULONG ) lSize - ulLen;
ulRest = ( HB_SIZE ) lSize - ulLen;
iRepl = ulRest / iTokens;
iRest = ulRest % iTokens;
iFirst = ( iRest + 1 ) >> 1;

4
harbour/contrib/hbct/dattime2.c
View File

@@ -135,7 +135,7 @@ static int ct_doy( long lDate )
*/
HB_FUNC( CTODOW )
{
ULONG ulLen = hb_parclen( 1 );
HB_SIZE ulLen = hb_parclen( 1 );
int iDow = 0;
if( ulLen )
@@ -183,7 +183,7 @@ HB_FUNC( CTODOW )
*/
HB_FUNC( CTOMONTH )
{
ULONG ulLen = hb_parclen( 1 );
HB_SIZE ulLen = hb_parclen( 1 );
int iMonth = 0;
if( ulLen )

4
harbour/contrib/hbct/disk.c
View File

@@ -122,8 +122,8 @@ HB_FUNC( DIRNAME )
HB_FUNC( DRIVETYPE )
{
#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE )
ULONG ulSize = hb_parclen( 1 ) + 2; /* allow space for '\0' & ":\" */
char *pszDrive = ( char * ) hb_xgrab( ulSize + 1 );
HB_SIZE ulSize = hb_parclen( 1 ) + 2; /* allow space for '\0' & ":\" */
char * pszDrive = ( char * ) hb_xgrab( ulSize + 1 );
LPTSTR lpDrive;
int iType;

2
harbour/contrib/hbct/expand.c
View File

@@ -55,7 +55,7 @@
HB_FUNC( EXPAND )
{
ULONG ulLen = hb_parclen( 1 ), ulSize, ul;
HB_SIZE ulLen = hb_parclen( 1 ), ulSize, ul;
if( ulLen > 0 )
{

8
harbour/contrib/hbct/files.c
View File

@@ -98,7 +98,7 @@
typedef struct
{
PHB_FFIND ffind;
ULONG ulAttr;
HB_FATTR ulAttr;
} HB_FFDATA, * PHB_FFDATA;
static void hb_fileFindRelease( void * cargo )
@@ -114,7 +114,7 @@ static HB_TSD_NEW( s_FFData, sizeof( HB_FFDATA ), NULL, hb_fileFindRelease );
#define HB_GET_FFDATA() ( ( PHB_FFDATA ) hb_stackGetTSD( &s_FFData ) )
static PHB_FFIND _hb_fileStart( BOOL fNext, ULONG ulAttr )
static PHB_FFIND _hb_fileStart( BOOL fNext, HB_FATTR ulAttr )
{
PHB_FFDATA pFFData = HB_GET_FFDATA();
@@ -133,7 +133,7 @@ static PHB_FFIND _hb_fileStart( BOOL fNext, ULONG ulAttr )
{
szFile = hb_fsNameConv( szFile, &pszFree );
if( HB_ISNUM( 2 ) )
ulAttr = ( ULONG ) hb_parnl( 2 );
ulAttr = ( HB_FATTR ) hb_parnl( 2 );
pFFData->ulAttr = hb_parl( 3 ) ? ulAttr : 0;
pFFData->ffind = hb_fsFindFirst( szFile, ulAttr );
if( pszFree )
@@ -267,7 +267,7 @@ HB_FUNC( FILEDELETE )
{
const char * pDirSpec;
PHB_FFIND ffind;
ULONG ulAttr = HB_FA_ALL;
HB_FATTR ulAttr = HB_FA_ALL;
char * pszFree;
pDirSpec = hb_fsNameConv( hb_parc( 1 ), &pszFree );

2
harbour/contrib/hbct/misc2.c
View File

@@ -61,7 +61,7 @@ HB_FUNC( COMPLEMENT )
{
if( HB_IS_STRING( pItem ) )
{
ULONG ulLen = hb_itemGetCLen( pItem ), ulPos;
HB_SIZE ulLen = hb_itemGetCLen( pItem ), ulPos;
if( ulLen > 0 )
{

2
harbour/contrib/xhb/xhb.h
View File

@@ -60,7 +60,7 @@ HB_EXTERN_BEGIN
/* functions in hboutdbg.c */
extern HB_EXPORT BOOL hb_OutDebugName( PHB_ITEM pName );
extern HB_EXPORT void hb_OutDebug( const char * szMsg, ULONG ulMsgLen );
extern HB_EXPORT void hb_OutDebug( const char * szMsg, HB_SIZE ulMsgLen );
/* functions in dbgfxc.c */
extern HB_EXPORT BOOL hb_ToOutDebugOnOff( BOOL bOnOff );

42
harbour/include/hbapifs.h
View File

@@ -158,10 +158,10 @@ extern HB_EXPORT BOOL hb_fsChDir ( const char * pszDirName ); /* cha
extern HB_EXPORT HB_ERRCODE hb_fsChDrv ( BYTE nDrive ); /* change working drive */
extern HB_EXPORT void hb_fsClose ( HB_FHANDLE hFileHandle ); /* close a file */
extern HB_EXPORT void hb_fsCommit ( HB_FHANDLE hFileHandle ); /* commit updates of a file */
extern HB_EXPORT HB_FHANDLE hb_fsCreate ( const char * pszFileName, ULONG ulAttr ); /* create a file */
extern HB_EXPORT HB_FHANDLE hb_fsCreateEx ( const char * pszFilename, ULONG ulAttr, USHORT uiFlags ); /* create a file, with specific open mode */
extern HB_EXPORT HB_FHANDLE hb_fsCreateTemp ( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName ); /* create a temporary file from components */
extern HB_EXPORT HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, ULONG ulAttr ); /* create a temporary file from components */
extern HB_EXPORT HB_FHANDLE hb_fsCreate ( const char * pszFileName, HB_FATTR ulAttr ); /* create a file */
extern HB_EXPORT HB_FHANDLE hb_fsCreateEx ( const char * pszFilename, HB_FATTR ulAttr, USHORT uiFlags ); /* create a file, with specific open mode */
extern HB_EXPORT HB_FHANDLE hb_fsCreateTemp ( const char * pszDir, const char * pszPrefix, HB_FATTR ulAttr, char * pszName ); /* create a temporary file from components */
extern HB_EXPORT HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, HB_FATTR ulAttr ); /* create a temporary file from components */
extern HB_EXPORT const char * hb_fsCurDir ( USHORT uiDrive ); /* retrieve a static pointer containing current directory for specified drive */
extern HB_EXPORT HB_ERRCODE hb_fsCurDirBuff ( USHORT uiDrive, char * pbyBuffer, HB_SIZE ulLen ); /* copy current directory for given drive into a buffer */
extern HB_EXPORT void hb_fsBaseDirBuff ( char * pbyBuffer ); /* retrieve the base dir of the executable */
@@ -195,8 +195,8 @@ extern HB_EXPORT ULONG hb_fsTell ( HB_FHANDLE hFileHandle ); /* retr
extern HB_EXPORT int hb_fsSetDevMode ( HB_FHANDLE hFileHandle, int iDevMode ); /* change the device mode of a file (text/binary) */
extern HB_EXPORT BOOL hb_fsGetFileTime ( const char * pszFileName, long * plJulian, long * plMillisec );
extern HB_EXPORT BOOL hb_fsSetFileTime ( const char * pszFileName, long lJulian, long lMillisec );
extern HB_EXPORT BOOL hb_fsGetAttr ( const char * pszFileName, ULONG * pulAttr );
extern HB_EXPORT BOOL hb_fsSetAttr ( const char * pszFileName, ULONG ulAttr );
extern HB_EXPORT BOOL hb_fsGetAttr ( const char * pszFileName, HB_FATTR * pulAttr );
extern HB_EXPORT BOOL hb_fsSetAttr ( const char * pszFileName, HB_FATTR ulAttr );
extern HB_EXPORT void hb_fsSetError ( HB_ERRCODE uiError ); /* set the file system DOS error number */
extern HB_EXPORT void hb_fsSetIOError ( BOOL fResult, USHORT uiOperation ); /* set the file system error number after IO operation */
extern HB_EXPORT BOOL hb_fsTruncAt ( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ); /* truncate file to given size */
@@ -264,8 +264,8 @@ extern HB_EXPORT void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList );
extern HB_EXPORT BOOL hb_spFile( const char * pFilename, char * pRetPath );
extern HB_EXPORT BOOL hb_spFileExists( const char * pFilename, char * pRetPath );
extern HB_EXPORT HB_FHANDLE hb_spOpen( const char * pFilename, USHORT uiFlags );
extern HB_EXPORT HB_FHANDLE hb_spCreate( const char * pFilename, ULONG ulAttr );
extern HB_EXPORT HB_FHANDLE hb_spCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags );
extern HB_EXPORT HB_FHANDLE hb_spCreate( const char * pFilename, HB_FATTR ulAttr );
extern HB_EXPORT HB_FHANDLE hb_spCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlags );
/* File Find API structure */
typedef struct
@@ -274,21 +274,21 @@ typedef struct
LONG lDate;
char szDate[ 9 ]; /* in YYYYMMDD format */
char szTime[ 9 ]; /* in HH:MM:SS format */
ULONG attr;
HB_FATTR attr;
HB_FOFFSET size;
/* Private */
const char * pszFileMask;
ULONG attrmask;
BOOL bFirst;
HB_FATTR attrmask;
BOOL bFirst;
void * info; /* Pointer to the platform specific find info */
} HB_FFIND, * PHB_FFIND;
/* File Find API functions */
extern HB_EXPORT PHB_FFIND hb_fsFindFirst( const char * pszFileName, ULONG ulAttrMask );
extern HB_EXPORT PHB_FFIND hb_fsFindFirst( const char * pszFileName, HB_FATTR ulAttrMask );
extern HB_EXPORT BOOL hb_fsFindNext( PHB_FFIND ffind );
extern HB_EXPORT void hb_fsFindClose( PHB_FFIND ffind );
@@ -298,18 +298,18 @@ extern HB_FHANDLE hb_fsProcessOpen( const char *pszFilename,
HB_FHANDLE *phStderr,
BOOL fDetach, ULONG *pulPID );
extern int hb_fsProcessRun( const char *pszFilename,
const char * pStdInBuf, ULONG ulStdInLen,
char ** pStdOutPtr, ULONG * pulStdOut,
char ** pStdErrPtr, ULONG * pulStdErr,
const char * pStdInBuf, HB_SIZE ulStdInLen,
char ** pStdOutPtr, HB_SIZE * pulStdOut,
char ** pStdErrPtr, HB_SIZE * pulStdErr,
BOOL fDetach );
extern int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait );
extern BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle );
/* Misc helper functions */
extern ULONG hb_fsAttrFromRaw( ULONG raw_attr );
extern ULONG hb_fsAttrToRaw( ULONG ulAttr );
extern ULONG hb_fsAttrEncode( const char * szAttr );
extern char * hb_fsAttrDecode( ULONG ulAttr, char * szAttr );
extern HB_FATTR hb_fsAttrFromRaw( HB_FATTR raw_attr );
extern HB_FATTR hb_fsAttrToRaw( HB_FATTR ulAttr );
extern HB_FATTR hb_fsAttrEncode( const char * szAttr );
extern char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr );
extern HB_EXPORT BOOL hb_fsMaxFilesError( void );
extern HB_EXPORT const char * hb_fsNameConv( const char * szFileName, char ** pszFree );
@@ -353,12 +353,12 @@ extern HB_EXPORT PHB_FILE hb_fileExtOpen( const char * pszFilename, const ch
USHORT uiExFlags, const char * pPaths,
PHB_ITEM pError );
extern HB_EXPORT PHB_FILE hb_fileCreateTemp( const char * pszDir, const char * pszPrefix,
ULONG ulAttr, char * pszName );
HB_FATTR ulAttr, char * pszName );
extern HB_EXPORT PHB_FILE hb_fileCreateTempEx( char * pszName,
const char * pszDir,
const char * pszPrefix,
const char * pszExt,
ULONG ulAttr );
HB_FATTR ulAttr );
extern HB_EXPORT void hb_fileClose( PHB_FILE pFile );
extern HB_EXPORT BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen, int iType );
extern HB_EXPORT ULONG hb_fileReadAt( PHB_FILE pFile, void * buffer, ULONG ulSize, HB_FOFFSET llOffset );

6
harbour/include/hbdefs.h
View File

@@ -455,7 +455,7 @@
# define HB_ULONG_MAX ULONG_MAX
typedef long HB_LONG; /* legacy */
typedef unsigned long HB_ULONG; /* legacy */
typedef long HB_MAXINT;
typedef long HB_MAXINT;
typedef unsigned long HB_MAXUINT;
# define PFHL "l"
#elif !defined( HB_LONG_LONG_OFF ) && ULONG_MAX == UINT_MAX
@@ -476,7 +476,7 @@
# define HB_ULONG_MAX ULONG_MAX
typedef long HB_LONG; /* legacy */
typedef unsigned long HB_ULONG; /* legacy */
typedef long HB_MAXINT;
typedef long HB_MAXINT;
typedef unsigned long HB_MAXUINT;
# define PFHL "l"
#endif
@@ -721,6 +721,8 @@ typedef unsigned long HB_SIZE; /* TOFIX: Currently ULONG, to be
typedef void * HB_PTRVAL; /* TOFIX */
/* typedef HB_POINTER; */ /* TOFIX */
typedef unsigned long HB_FATTR;
/* Harbour strict bit types: */
typedef signed char HB_I8;
typedef unsigned char HB_U8;

20
harbour/src/common/hbffind.c
View File

@@ -172,9 +172,9 @@
/* ------------------------------------------------------------- */
ULONG hb_fsAttrFromRaw( ULONG raw_attr )
HB_FATTR hb_fsAttrFromRaw( HB_FATTR raw_attr )
{
ULONG ulAttr;
HB_FATTR ulAttr;
HB_TRACE(HB_TR_DEBUG, ("hb_fsAttrFromRaw(%lu)", raw_attr));
@@ -254,9 +254,9 @@ ULONG hb_fsAttrFromRaw( ULONG raw_attr )
return ulAttr;
}
ULONG hb_fsAttrToRaw( ULONG ulAttr )
HB_FATTR hb_fsAttrToRaw( HB_FATTR ulAttr )
{
ULONG raw_attr;
HB_FATTR raw_attr;
HB_TRACE(HB_TR_DEBUG, ("hb_fsAttrToRaw(%lu)", ulAttr));
@@ -327,11 +327,11 @@ ULONG hb_fsAttrToRaw( ULONG ulAttr )
/* Converts a CA-Cl*pper compatible file attribute string
to the internal reprensentation. */
ULONG hb_fsAttrEncode( const char * szAttr )
HB_FATTR hb_fsAttrEncode( const char * szAttr )
{
const char * pos = szAttr;
char ch;
ULONG ulAttr = 0;
HB_FATTR ulAttr = 0;
HB_TRACE(HB_TR_DEBUG, ("hb_fsAttrEncode(%p)", szAttr));
@@ -358,7 +358,7 @@ ULONG hb_fsAttrEncode( const char * szAttr )
/* NOTE: szAttr buffer must be at least 16 chars long */
char * hb_fsAttrDecode( ULONG ulAttr, char * szAttr )
char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr )
{
char * ptr = szAttr;
@@ -393,7 +393,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
int iMin = 0;
int iSec = 0;
ULONG raw_attr = 0;
HB_FATTR raw_attr = 0;
/* Set the default values in case some platforms don't
support some of these, or they may fail on them. */
@@ -591,7 +591,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
#endif
}
raw_attr = ( ULONG ) info->pFindFileData.dwFileAttributes;
raw_attr = ( HB_FATTR ) info->pFindFileData.dwFileAttributes;
/* NOTE: One of these may fail when searching on an UNC path, I
don't know yet what's the reason. [vszakats] */
@@ -764,7 +764,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
return bFound;
}
PHB_FFIND hb_fsFindFirst( const char * pszFileMask, ULONG attrmask )
PHB_FFIND hb_fsFindFirst( const char * pszFileMask, HB_FATTR attrmask )
{
PHB_FFIND ffind;

4
harbour/src/rtl/filebuf.c
View File

@@ -697,7 +697,7 @@ HB_FHANDLE hb_fileHandle( PHB_FILE pFile )
/* internal FILE structures only */
PHB_FILE hb_fileCreateTemp( const char * pszDir, const char * pszPrefix,
ULONG ulAttr, char * pszName )
HB_FATTR ulAttr, char * pszName )
{
PHB_FILE pFile = NULL;
HB_FHANDLE hFile;
@@ -713,7 +713,7 @@ PHB_FILE hb_fileCreateTempEx( char * pszName,
const char * pszDir,
const char * pszPrefix,
const char * pszExt,
ULONG ulAttr )
HB_FATTR ulAttr )
{
PHB_FILE pFile = NULL;
HB_FHANDLE hFile;

12
harbour/src/rtl/filesys.c
View File

@@ -314,7 +314,7 @@ static HANDLE DosToWinHandle( HB_FHANDLE fHandle )
return ( HANDLE ) fHandle;
}
static void convert_open_flags( BOOL fCreate, ULONG ulAttr, USHORT uiFlags,
static void convert_open_flags( BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
DWORD *dwMode, DWORD *dwShare,
DWORD *dwCreat, DWORD *dwAttr )
{
@@ -390,7 +390,7 @@ static void convert_open_flags( BOOL fCreate, ULONG ulAttr, USHORT uiFlags,
#else
static void convert_open_flags( BOOL fCreate, ULONG ulAttr, USHORT uiFlags,
static void convert_open_flags( BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
int *flags, unsigned *mode,
int *share, int *attr )
{
@@ -709,7 +709,7 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags )
return hFileHandle;
}
HB_FHANDLE hb_fsCreate( const char * pFilename, ULONG ulAttr )
HB_FHANDLE hb_fsCreate( const char * pFilename, HB_FATTR ulAttr )
{
HB_FHANDLE hFileHandle;
char * pszFree;
@@ -771,7 +771,7 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, ULONG ulAttr )
[vszakats]
*/
HB_FHANDLE hb_fsCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags )
HB_FHANDLE hb_fsCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlags )
{
HB_FHANDLE hFileHandle;
char * pszFree;
@@ -1012,7 +1012,7 @@ BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMilli
return fResult;
}
BOOL hb_fsGetAttr( const char * pszFileName, ULONG * pulAttr )
BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
{
BOOL fResult;
char * pszFree;
@@ -1282,7 +1282,7 @@ BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec )
return fResult;
}
BOOL hb_fsSetAttr( const char * pszFileName, ULONG ulAttr )
BOOL hb_fsSetAttr( const char * pszFileName, HB_FATTR ulAttr )
{
BOOL fResult;
char * pszFree;

12
harbour/src/rtl/fstemp.c
View File

@@ -133,7 +133,7 @@ static BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir )
}
#endif
static HB_FHANDLE hb_fsCreateTempLow( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName, const char * pszExt )
static HB_FHANDLE hb_fsCreateTempLow( const char * pszDir, const char * pszPrefix, HB_FATTR ulAttr, char * pszName, const char * pszExt )
{
/* less attemps */
int iAttemptLeft = 99, iLen;
@@ -320,7 +320,7 @@ static BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * p
/* NOTE: The pszName buffer must be at least HB_PATH_MAX chars long */
HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName )
HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, HB_FATTR ulAttr, char * pszName )
{
int iAttemptLeft = 999;
@@ -355,7 +355,7 @@ HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, ULONG u
#else /* HB_OS_UNIX */
HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName )
HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, HB_FATTR ulAttr, char * pszName )
{
return hb_fsCreateTempLow( pszDir, pszPrefix, ulAttr, pszName, NULL );
}
@@ -368,13 +368,13 @@ HB_FUNC( HB_FTEMPCREATE )
hb_retnint( ( HB_NHANDLE ) hb_fsCreateTemp( hb_parc( 1 ),
hb_parc( 2 ),
( ULONG ) ( HB_ISNUM( 3 ) ? ( ULONG ) hb_parnl( 3 ) : FC_NORMAL ),
( HB_FATTR ) ( HB_ISNUM( 3 ) ? hb_parnl( 3 ) : FC_NORMAL ),
szName ) );
hb_storc( szName, 4 );
}
HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, ULONG ulAttr )
HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, HB_FATTR ulAttr )
{
return hb_fsCreateTempLow( pszDir, pszPrefix, ulAttr, pszName, pszExt );
}
@@ -387,7 +387,7 @@ HB_FUNC( HB_FTEMPCREATEEX )
hb_parc( 2 ),
hb_parc( 3 ),
hb_parc( 4 ),
( ULONG ) ( HB_ISNUM( 5 ) ? ( ULONG ) hb_parnl( 5 ) : FC_NORMAL ) ) );
( HB_FATTR ) ( HB_ISNUM( 5 ) ? hb_parnl( 5 ) : FC_NORMAL ) ) );
hb_storc( szName, 1 );
}

2
harbour/src/rtl/philes.c
View File

@@ -362,7 +362,7 @@ HB_FUNC( HB_FUNLOCK )
HB_FUNC( HB_FGETATTR )
{
ULONG nAttr;
HB_FATTR nAttr;
hb_retl( hb_fsGetAttr( hb_parcx( 1 ), &nAttr ) );

4
harbour/src/rtl/spfiles.c
View File

@@ -193,7 +193,7 @@ HB_FHANDLE hb_spOpen( const char * pFilename, USHORT uiFlags )
return hb_fsOpen( pFilename, uiFlags );
}
HB_FHANDLE hb_spCreate( const char * pFilename, ULONG ulAttr )
HB_FHANDLE hb_spCreate( const char * pFilename, HB_FATTR ulAttr )
{
char path[ HB_PATH_MAX ];
PHB_FNAME pFilepath;
@@ -210,7 +210,7 @@ HB_FHANDLE hb_spCreate( const char * pFilename, ULONG ulAttr )
return hb_fsCreate( path, ulAttr );
}
HB_FHANDLE hb_spCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags )
HB_FHANDLE hb_spCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlags )
{
char path[ HB_PATH_MAX ];
PHB_FNAME pFilepath;