Просмотр исходного кода

ncd: NCDVal: store types as int not uint8_t

ambrop7 13 лет назад
Родитель
Сommit
88c3e84891
2 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      ncd/NCDVal.c
  2. 3 3
      ncd/NCDVal.h

+ 3 - 3
ncd/NCDVal.c

@@ -114,10 +114,10 @@ static void NCDVal__AssertMem (NCDValMem *mem)
 static void NCDVal__AssertValOnly (NCDValMem *mem, NCDVal__idx idx)
 {
     ASSERT(idx >= 0)
-    ASSERT(idx + sizeof(uint8_t) <= mem->used)
+    ASSERT(idx + sizeof(int) <= mem->used)
     
 #ifndef NDEBUG
-    uint8_t *type_ptr = NCDValMem__BufAt(mem, idx);
+    int *type_ptr = NCDValMem__BufAt(mem, idx);
     
     switch (*type_ptr) {
         case NCDVAL_STRING: {
@@ -216,7 +216,7 @@ int NCDVal_Type (NCDValRef val)
 {
     NCDVal__AssertVal(val);
     
-    uint8_t *type_ptr = NCDValMem__BufAt(val.mem, val.idx);
+    int *type_ptr = NCDValMem__BufAt(val.mem, val.idx);
     
     return *type_ptr;
 }

+ 3 - 3
ncd/NCDVal.h

@@ -62,13 +62,13 @@ typedef struct {
 } NCDValSafeRef;
 
 struct NCDVal__string {
-    uint8_t type;
+    int type;
     NCDVal__idx length;
     char data[];
 };
 
 struct NCDVal__list {
-    uint8_t type;
+    int type;
     NCDVal__idx maxcount;
     NCDVal__idx count;
     NCDVal__idx elem_indices[];
@@ -89,7 +89,7 @@ typedef NCDValMem *NCDVal__maptree_arg;
 #include <structure/CAvl_decl.h>
 
 struct NCDVal__map {
-    uint8_t type;
+    int type;
     NCDVal__idx maxcount;
     NCDVal__idx count;
     NCDVal__MapTree tree;