[haiku-commits] haiku: hrev43624 - src/kits/tracker
- From: stpere@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 5 Jan 2012 01:34:22 +0100 (CET)
hrev43624 adds 1 changeset to branch 'master'
old head: aa11dcae4d77ddc43150564915bcfc845d281b5d
new head: dafbb164060463db6c906f729c05975c246bae7f
----------------------------------------------------------------------------
dafbb16: Tracker (FSUtils): negative passed to unsigned parameter
BVolume::BlockSize() might return a negative value (error code) and it
was passed as parameter of CalcItemsAndSize() as a size_t (unsigned).
Thus the check for an error code failed.
CID 4171.
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43624
Commit: dafbb164060463db6c906f729c05975c246bae7f
URL: http://cgit.haiku-os.org/haiku/commit/?id=dafbb16
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Thu Jan 5 00:31:17 2012 UTC
----------------------------------------------------------------------------
1 files changed, 2 insertions(+), 2 deletions(-)
src/kits/tracker/FSUtils.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index 573380a..150225b 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -115,7 +115,7 @@ static status_t MoveTask(BObjectList<entry_ref> *, BEntry
*, BList *, uint32);
static status_t _DeleteTask(BObjectList<entry_ref> *, bool);
static status_t _RestoreTask(BObjectList<entry_ref> *);
status_t CalcItemsAndSize(CopyLoopControl* loopControl,
- BObjectList<entry_ref> *refList, size_t blockSize, int32 *totalCount,
+ BObjectList<entry_ref> *refList, ssize_t blockSize, int32 *totalCount,
off_t *totalSize);
status_t MoveItem(BEntry *entry, BDirectory *destDir, BPoint *loc,
uint32 moveMode, const char *newName, Undo &undo,
@@ -2391,7 +2391,7 @@ FSRecursiveCalcSize(BInfoWindow* window, CopyLoopControl*
loopControl,
status_t
CalcItemsAndSize(CopyLoopControl* loopControl, BObjectList<entry_ref> *refList,
- size_t blockSize, int32 *totalCount, off_t *totalSize)
+ ssize_t blockSize, int32 *totalCount, off_t *totalSize)
{
int32 fileCount = 0;
int32 dirCount = 0;
Other related posts:
- » [haiku-commits] haiku: hrev43624 - src/kits/tracker - stpere
