Changeset 979bd0f in git

Timestamp:

Jan 4, 2013, 6:26:57 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

135e786e5c9fb6076513871d7c285afd8b891a7e

Parents:

ce0455b56042df7493ea3bb90650feacef0f4d39

Message:

fix: omBin.c:omGetUsedBytesOfBin

Location:

omalloc

Files:

• omBin.c (modified) (1 diff)
• omBin.h (modified) (1 diff)

omalloc/omBin.c

@@ -751 +751 @@
 }
 
-static  int omGetUsedBytesOfBin(omBin bin)
+static long omGetUsedBytesOfBin(omBin bin)
 {
   int pages = 0, used_blocks = 0, free_blocks = 0;
   omGetTotalBinStat(bin, &pages, &used_blocks, &free_blocks);
-  return used_blocks*bin->sizeW*SIZEOF_LONG;
-}
-
-size_t omGetUsedBinBytes()
+  return ((long)used_blocks)*((long)bin->sizeW)*SIZEOF_LONG;
+}
+
+long omGetUsedBinBytes()
 {
   int i = OM_MAX_BIN_INDEX;
   omSpecBin s_bin = om_SpecBin;
-  size_t used = 0;
+  long used = 0;
   omBin sticky;
 

omalloc/omBin.h

@@ -14 +14 @@
 #define omUnGetSpecBin(bin_ptr) _omUnGetSpecBin(bin_ptr, 0)
 #define omDeleteSpecBin(bin_ptr) _omUnGetSpecBin(bin_ptr, 1)
-void  _omUnGetSpecBin(omBin *bin, int force);
-size_t omGetUsedBinBytes();
+void _omUnGetSpecBin(omBin *bin, int force);
+long omGetUsedBinBytes();
 
 omBin omGetStickyBinOfBin(omBin bin);