From c9eba27d586d2d1e45a4ae0fcf66aca2869c9dde Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Fri, 31 Mar 2000 11:43:19 +0000 Subject: [PATCH] 20000331-06:40 est --- harbour/ChangeLog | 4 ++++ harbour/source/rtl/diskspac.c | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f30b70e364..6631baba14 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +20000331-06:40 EST Paul Tucker + * source/rtl/diskspac.c + * minor code opt. + 20000331-04:30 EST Paul Tucker * include/hbvmpub.h * put the #pragma pack in _MSC_VER gaurds which got missed in the diff --git a/harbour/source/rtl/diskspac.c b/harbour/source/rtl/diskspac.c index dca0869d1d..e24afb1baa 100644 --- a/harbour/source/rtl/diskspac.c +++ b/harbour/source/rtl/diskspac.c @@ -103,13 +103,14 @@ HB_FUNC( DISKSPACE ) dSpace = ( double ) disk.total_clusters * ( double ) disk.sectors_per_cluster * ( double ) disk.bytes_per_sector; + + if( uiType == HB_DISK_USED ) + dSpace -= ( double ) disk.avail_clusters * + ( double ) disk.sectors_per_cluster * + ( double ) disk.bytes_per_sector; break; } - if( uiType == HB_DISK_USED ) - dSpace -= ( double ) disk.avail_clusters * - ( double ) disk.sectors_per_cluster * - ( double ) disk.bytes_per_sector; } #elif defined(HB_OS_WIN_32) @@ -242,14 +243,14 @@ HB_FUNC( DISKSPACE ) dSpace = ( double ) dwTotalNumberOfClusters * ( double ) dwSectorsPerCluster * ( double ) dwBytesPerSector; + + if( uiType == HB_DISK_USED ) + dSpace -= ( double ) dwNumberOfFreeClusters * + ( double ) dwSectorsPerCluster * + ( double ) dwBytesPerSector; break; } - - if( uiType == HB_DISK_USED ) - dSpace -= ( double ) dwNumberOfFreeClusters * - ( double ) dwSectorsPerCluster * - ( double ) dwBytesPerSector; } }