Warning tests are failing in this version

[nbds] / include / common.h

diff --git a/include/common.h b/include/common.h
index faebe4c807160d7f093bb34a85acd0e584dcc305..9abf743face43c88fd48a0be811ced272819e56b 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #define malloc "DON'T USE MALLOC" // use nbd_malloc() instead
+#define calloc "DON'T USE CALLOC" // use nbd_malloc() instead
 #define free   "DON'T USE FREE"   // use nbd_free() instead
 
 #define MAX_NUM_THREADS 4 // make this whatever you want, but make it a power of 2
@@ -33,14 +34,15 @@
 
 #define TAG1         (1ULL << 63)
 #define TAG2         (1ULL << 62)
-#define TAG_VALUE(v, tag) ((uint64_t)(v) |  tag)
-#define IS_TAGGED(v, tag) ((uint64_t)(v) &  tag)
-#define STRIP_TAG(v, tag) ((uint64_t)(v) & ~tag)
+#define TAG_VALUE(v, tag) ((v) |  tag)
+#define IS_TAGGED(v, tag) ((v) &  tag)
+#define STRIP_TAG(v, tag) ((v) & ~tag)
 
 #define DOES_NOT_EXIST 0
 #define ERROR_INVALID_OPTION (-1)
 #define ERROR_INVALID_ARGUMENT (-2)
 #define ERROR_UNSUPPORTED_FEATURE (-3)
+#define ERROR_TXN_NOT_RUNNING (-4)
 
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;