提交 d566ac92 编写于 作者: A Alex Duan

fix(util): replace with new ASSERTS

上级 292bf019
...@@ -39,7 +39,7 @@ static void median(void *src, int64_t size, int64_t s, int64_t e, const void *pa ...@@ -39,7 +39,7 @@ static void median(void *src, int64_t size, int64_t s, int64_t e, const void *pa
doswap(elePtrAt(src, size, s), elePtrAt(src, size, e), size, buf); doswap(elePtrAt(src, size, s), elePtrAt(src, size, e), size, buf);
} }
assert(comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, s), param) <= 0 && ASSERT(comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, s), param) <= 0 &&
comparFn(elePtrAt(src, size, s), elePtrAt(src, size, e), param) <= 0); comparFn(elePtrAt(src, size, s), elePtrAt(src, size, e), param) <= 0);
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
......
...@@ -54,7 +54,7 @@ const char* tbufRead(SBufferReader* buf, size_t size) { ...@@ -54,7 +54,7 @@ const char* tbufRead(SBufferReader* buf, size_t size) {
} }
void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size) { void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size) {
assert(dst != NULL); ASSERT(dst != NULL);
// always using memcpy, leave optimization to compiler // always using memcpy, leave optimization to compiler
memcpy(dst, tbufRead(buf, size), size); memcpy(dst, tbufRead(buf, size), size);
} }
...@@ -103,7 +103,7 @@ const char* tbufReadBinary(SBufferReader* buf, size_t* len) { ...@@ -103,7 +103,7 @@ const char* tbufReadBinary(SBufferReader* buf, size_t* len) {
} }
size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size) { size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size) {
assert(dst != NULL); ASSERTS(dst != NULL, "dst != NULL");
size_t len; size_t len;
const char* data = tbufReadBinary(buf, &len); const char* data = tbufReadBinary(buf, &len);
if (len >= size) { if (len >= size) {
...@@ -252,17 +252,17 @@ char* tbufGetData(SBufferWriter* buf, bool takeOver) { ...@@ -252,17 +252,17 @@ char* tbufGetData(SBufferWriter* buf, bool takeOver) {
} }
void tbufWrite(SBufferWriter* buf, const void* data, size_t size) { void tbufWrite(SBufferWriter* buf, const void* data, size_t size) {
assert(data != NULL); ASSERTS(data != NULL, "data != NULL");
tbufEnsureCapacity(buf, size); tbufEnsureCapacity(buf, size);
memcpy(buf->data + buf->pos, data, size); memcpy(buf->data + buf->pos, data, size);
buf->pos += size; buf->pos += size;
} }
void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size) { void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size) {
assert(data != NULL); ASSERTS(data != NULL, "data != NULL");
// this function can only be called to fill the gap on previous writes, // this function can only be called to fill the gap on previous writes,
// so 'pos + size <= buf->pos' must be true // so 'pos + size <= buf->pos' must be true
assert(pos + size <= buf->pos); ASSERTS(pos + size <= buf->pos, "pos + size <= buf->pos");
memcpy(buf->data + pos, data, size); memcpy(buf->data + pos, data, size);
} }
...@@ -270,7 +270,7 @@ static void tbufWriteLength(SBufferWriter* buf, size_t len) { ...@@ -270,7 +270,7 @@ static void tbufWriteLength(SBufferWriter* buf, size_t len) {
// maximum length is 65535, if larger length is required // maximum length is 65535, if larger length is required
// this function and the corresponding read function need to be // this function and the corresponding read function need to be
// revised. // revised.
assert(len <= 0xffff); ASSERTS(len <= 0xffff, "len <= 0xffff");
tbufWriteUint16(buf, (uint16_t)len); tbufWriteUint16(buf, (uint16_t)len);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册