瀏覽代碼

Coverage everything, cleanup

Kajetan Johannes Hammerle 2 周之前
父節點
當前提交
163db070cc
共有 4 個文件被更改,包括 5 次插入17 次删除
  1. 0 12
      include/core/Utility.h
  2. 2 2
      src/BitArray.c
  3. 0 2
      src/Utility.c
  4. 3 1
      test/modules/BitArrayTests.c

+ 0 - 12
include/core/Utility.h

@@ -18,18 +18,6 @@ inline size_t coreMinSize(size_t a, size_t b) {
     return a < b ? a : b;
 }
 
-#define CORE_SWAP(a, b, type)                                                  \
-    {                                                                          \
-        type tmp = *a;                                                         \
-        *a = *b;                                                               \
-        *b = tmp;                                                              \
-    }
-
-inline void coreSwapSize(size_t* a, size_t* b) {
-    CORE_SWAP(a, b, size_t)
-}
-inline void coreSwapPointer(void** a, void** b){CORE_SWAP(a, b, void*)}
-
 size_t coreToStringSize(const void* p, char* buffer, size_t n);
 void coreStringAdd(size_t* w, char** buffer, size_t* n, size_t shift);
 void coreStringAddI(size_t* w, char** buffer, size_t* n, int shift);

+ 2 - 2
src/BitArray.c

@@ -133,8 +133,8 @@ void coreResizeBitArray(CoreBitArray* a, size_t newLength, size_t newBits) {
     }
     coreFree(a->data);
     a->data = newData;
-    a->length = newLength;
-    a->bits = newBits;
+    a->length = newLength & 0xFFFFFFFFFFFFFF;
+    a->bits = newBits & 0xFF;
 }
 
 void coreFillBitArray(CoreBitArray* a, u64 value) {

+ 0 - 2
src/Utility.c

@@ -11,8 +11,6 @@
 
 extern inline size_t coreMaxSize(size_t a, size_t b);
 extern inline size_t coreMinSize(size_t a, size_t b);
-extern inline void coreSwapSize(size_t* a, size_t* b);
-extern inline void coreSwapPointer(void** a, void** b);
 
 static CoreExitHandler exitHandler = nullptr;
 static void* exitData = nullptr;

+ 3 - 1
test/modules/BitArrayTests.c

@@ -42,7 +42,7 @@ static void testRandomSetReadResize() {
     for(size_t i = 0; i < bits.length; i++) {
         CORE_TEST_U64(data[i], coreBitArrayGet(&bits, i));
     }
-    coreResizeBitArray(&bits, bits.length, bits.bits + 1);
+    coreResizeBitArray(&bits, bits.length, bits.bits + 1u);
     CORE_TEST_U64(14, bits.bits);
     CORE_TEST_U64(100, bits.length);
     for(size_t i = 0; i < bits.length; i++) {
@@ -60,6 +60,7 @@ static void testCopy() {
     coreBitArraySet(&bits, 3, 4);
     CoreBitArray copy = CORE_BIT_ARRAY;
     coreCopyBitArray(&copy, &bits);
+    coreCopyBitArray(&copy, &copy);
     CORE_TEST_U64(1, coreBitArrayGet(&copy, 0));
     CORE_TEST_U64(2, coreBitArrayGet(&copy, 1));
     CORE_TEST_U64(3, coreBitArrayGet(&copy, 2));
@@ -149,6 +150,7 @@ static void testMove() {
     }
     CoreBitArray m = CORE_BIT_ARRAY;
     coreMoveBitArray(&m, &bits);
+    coreMoveBitArray(&m, &m);
     CORE_TEST_U64(8, m.length);
     for(size_t i = 0; i < m.length; i++) {
         CORE_TEST_U64(i, coreBitArrayGet(&m, i));