Rename VALIDATE_*_TRI to VALIDATE_*_INT

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

diff --git a/src/lib/comp/comp.c b/src/lib/comp/comp.c
index e7c5b4e69b9446571b3dffe42511283f91afef2c..d5c7cb275977bb6512d8810e8a9715053ba6a1dd 100644 (file)
--- a/src/lib/comp/comp.c
+++ b/src/lib/comp/comp.c
@@ -85,9 +85,9 @@ static int set_comp_type(zckCtx *zck, ssize_t type) {
 
 static size_t comp_read_from_dc(zckCtx *zck, zckComp *comp, char *dst,
                                 size_t dst_size) {
-    VALIDATE_TRI(zck);
-    _VALIDATE_TRI(comp);
-    _VALIDATE_TRI(dst);
+    VALIDATE_INT(zck);
+    _VALIDATE_INT(comp);
+    _VALIDATE_INT(dst);
 
     size_t dl_size = dst_size;
     if(dl_size > comp->dc_data_size - comp->dc_data_loc)
@@ -121,7 +121,7 @@ static int comp_add_to_data(zckCtx *zck, zckComp *comp, const char *src,
 }
 
 static ssize_t comp_end_dchunk(zckCtx *zck, int use_dict, size_t fd_size) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     ssize_t rb = zck->comp.end_dchunk(zck, &(zck->comp), use_dict, fd_size);
     if(validate_current_chunk(zck) < 1)
@@ -134,7 +134,7 @@ static ssize_t comp_end_dchunk(zckCtx *zck, int use_dict, size_t fd_size) {
 }
 
 static ssize_t comp_write(zckCtx *zck, const char *src, const size_t src_size) {
-    VALIDATE_WRITE_TRI(zck);
+    VALIDATE_WRITE_INT(zck);
 
     if(!zck->comp.started && !comp_init(zck))
         return -1;
@@ -328,7 +328,7 @@ int comp_add_to_dc(zckCtx *zck, zckComp *comp, const char *src,
 }
 
 ssize_t comp_read(zckCtx *zck, char *dst, size_t dst_size, int use_dict) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     if(!zck->comp.started) {
         set_error(zck, "Compression hasn't been initialized yet");
@@ -478,7 +478,7 @@ ssize_t PUBLIC zck_write(zckCtx *zck, const char *src, const size_t src_size) {
 }
 
 ssize_t PUBLIC zck_end_chunk(zckCtx *zck) {
-    VALIDATE_WRITE_TRI(zck);
+    VALIDATE_WRITE_INT(zck);
 
     if(!zck->comp.started && !comp_init(zck))
         return -1;
@@ -511,7 +511,7 @@ ssize_t PUBLIC zck_end_chunk(zckCtx *zck) {
 }
 
 ssize_t PUBLIC zck_read(zckCtx *zck, char *dst, size_t dst_size) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     return comp_read(zck, dst, dst_size, 1);
 }

diff --git a/src/lib/comp/zstd/zstd.c b/src/lib/comp/zstd/zstd.c
index db50c4d87de7ccde9708196b61a0124faaadc981..7cfb50cf21a5a26edffae4e01f4188e95746dd7e 100644 (file)
--- a/src/lib/comp/zstd/zstd.c
+++ b/src/lib/comp/zstd/zstd.c
@@ -62,8 +62,8 @@ static int init(zckCtx *zck, zckComp *comp) {
 static ssize_t compress(zckCtx *zck, zckComp *comp, const char *src,
                         const size_t src_size, char **dst, size_t *dst_size,
                         int use_dict) {
-    VALIDATE_TRI(zck);
-    _VALIDATE_TRI(comp);
+    VALIDATE_INT(zck);
+    _VALIDATE_INT(comp);
 
     comp->dc_data = realloc(comp->dc_data, comp->dc_data_size + src_size);
     if(comp->dc_data == NULL) {

diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c
index 5daf381c62608457cec346f54361617988de945d..29498b1aba3a9901e2b6de079254c808b31e4624 100644 (file)
--- a/src/lib/dl/dl.c
+++ b/src/lib/dl/dl.c
@@ -95,8 +95,8 @@ static int set_chunk_valid(zckDL *dl) {
 
 /* Write length or to end of current chunk, whichever comes first */
 static int dl_write(zckDL *dl, const char *at, size_t length) {
-    _VALIDATE_TRI(dl);
-    VALIDATE_TRI(dl->zck);
+    _VALIDATE_INT(dl);
+    VALIDATE_INT(dl->zck);
 
     int wb = 0;
     if(dl->write_in_chunk > 0) {
@@ -266,13 +266,13 @@ int PUBLIC zck_copy_chunks(zckCtx *src, zckCtx *tgt) {
 }
 
 ssize_t PUBLIC zck_dl_get_bytes_downloaded(zckDL *dl) {
-    _VALIDATE_TRI(dl);
+    _VALIDATE_INT(dl);
 
     return dl->dl;
 }
 
 ssize_t PUBLIC zck_dl_get_bytes_uploaded(zckDL *dl) {
-    _VALIDATE_TRI(dl);
+    _VALIDATE_INT(dl);
 
     return dl->ul;
 }

diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c
index 3bcb4c8a7c8407c92b2a607a493361891b822922..d8b8b888949fde5e495af436f2ef38724b6b42b4 100644 (file)
--- a/src/lib/dl/range.c
+++ b/src/lib/dl/range.c
@@ -230,7 +230,7 @@ char PUBLIC *zck_get_range(size_t start, size_t end) {
 }
 
 int PUBLIC zck_get_range_count(zckRange *range) {
-    _VALIDATE_TRI(range);
+    _VALIDATE_INT(range);
 
     return range->count;
 }

diff --git a/src/lib/hash/hash.c b/src/lib/hash/hash.c
index ff0c964f8a9ff9455f3eb1ff8bf20bb47373ac5b..b062588b2717c8d350948f5cb140f2c7d71c2300 100644 (file)
--- a/src/lib/hash/hash.c
+++ b/src/lib/hash/hash.c
@@ -479,25 +479,25 @@ const char PUBLIC *zck_hash_name_from_type(int hash_type) {
 }
 
 int PUBLIC zck_get_full_hash_type(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     return zck->hash_type.type;
 }
 
 ssize_t PUBLIC zck_get_full_digest_size(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     return zck->hash_type.digest_size;
 }
 
 int PUBLIC zck_get_chunk_hash_type(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     return zck->index.hash_type;
 }
 
 ssize_t PUBLIC zck_get_chunk_digest_size(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     return zck->index.digest_size;
 }

diff --git a/src/lib/header.c b/src/lib/header.c
index 1d74984b960476f68ad263c35f2903bb4f63cf43..3fe9b8f436a9159518fac38809f3c40e23041a86 100644 (file)
--- a/src/lib/header.c
+++ b/src/lib/header.c
@@ -566,17 +566,17 @@ int PUBLIC zck_read_header(zckCtx *zck) {
 }
 
 ssize_t PUBLIC zck_get_header_length(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
     return zck->lead_size + zck->header_length;
 }
 
 ssize_t PUBLIC zck_get_lead_length(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
     return zck->lead_size;
 }
 
 ssize_t PUBLIC zck_get_data_length(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
     zckChunk *idx = zck->index.first;
     while(idx->next != NULL)
         idx = idx->next;
@@ -584,6 +584,6 @@ ssize_t PUBLIC zck_get_data_length(zckCtx *zck) {
 }
 
 ssize_t PUBLIC zck_get_length(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
     return zck_get_header_length(zck) + zck_get_data_length(zck);
 }

diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c
index 1cadd4820ea73326fa1331d6783ee22f62db6307..5a80dca559e824dc3846a2873b4767e3bc7ff624 100644 (file)
--- a/src/lib/index/index_read.c
+++ b/src/lib/index/index_read.c
@@ -121,7 +121,7 @@ int index_read(zckCtx *zck, char *data, size_t size, size_t max_length) {
 }
 
 ssize_t PUBLIC zck_get_chunk_count(zckCtx *zck) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     return zck->index.count;
 }
@@ -139,10 +139,10 @@ zckChunk PUBLIC *zck_get_next_chunk(zckChunk *idx) {
 }
 
 ssize_t PUBLIC zck_get_chunk_start(zckChunk *idx) {
-    _VALIDATE_TRI(idx);
+    _VALIDATE_INT(idx);
 
     if(idx->zck) {
-        VALIDATE_TRI(idx->zck);
+        VALIDATE_INT(idx->zck);
         return idx->start + zck_get_header_length(idx->zck);
     } else {
         return idx->start;
@@ -150,19 +150,19 @@ ssize_t PUBLIC zck_get_chunk_start(zckChunk *idx) {
 }
 
 ssize_t PUBLIC zck_get_chunk_size(zckChunk *idx) {
-    _VALIDATE_TRI(idx);
+    _VALIDATE_INT(idx);
 
     return idx->length;
 }
 
 ssize_t PUBLIC zck_get_chunk_comp_size(zckChunk *idx) {
-    _VALIDATE_TRI(idx);
+    _VALIDATE_INT(idx);
 
     return idx->comp_length;
 }
 
 int PUBLIC zck_get_chunk_valid(zckChunk *idx) {
-    _VALIDATE_TRI(idx);
+    _VALIDATE_INT(idx);
 
     return idx->valid;
 }
@@ -179,7 +179,7 @@ int PUBLIC zck_compare_chunk_digest(zckChunk *a, zckChunk *b) {
 }
 
 int PUBLIC zck_missing_chunks(zckCtx *zck) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     int missing = 0;
     for(zckChunk *idx = zck->index.first; idx; idx=idx->next)
@@ -189,7 +189,7 @@ int PUBLIC zck_missing_chunks(zckCtx *zck) {
 }
 
 int PUBLIC zck_failed_chunks(zckCtx *zck) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     int failed = 0;
     for(zckChunk *idx = zck->index.first; idx; idx=idx->next)

diff --git a/src/lib/io.c b/src/lib/io.c
index f7c79f9eba52af08e54aa014c4e076e883c65f0f..651521ee99e86785b829624e514f3f9c923a2e3b 100644 (file)
--- a/src/lib/io.c
+++ b/src/lib/io.c
@@ -34,7 +34,7 @@
 #include "zck_private.h"
 
 ssize_t read_data(zckCtx *zck, char *data, size_t length) {
-    VALIDATE_READ_TRI(zck);
+    VALIDATE_READ_INT(zck);
 
     if(length == 0)
         return 0;
@@ -51,7 +51,7 @@ ssize_t read_data(zckCtx *zck, char *data, size_t length) {
 }
 
 int write_data(zckCtx *zck, int fd, const char *data, size_t length) {
-    VALIDATE_WRITE_TRI(zck);
+    VALIDATE_WRITE_INT(zck);
 
     if(length == 0)
         return True;
@@ -71,7 +71,7 @@ int write_data(zckCtx *zck, int fd, const char *data, size_t length) {
 }
 
 int seek_data(zckCtx *zck, off_t offset, int whence) {
-    VALIDATE_TRI(zck);
+    VALIDATE_INT(zck);
 
     if(lseek(zck->fd, offset, whence) == -1) {
         char *wh_str = NULL;

diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index 3e3fc339a0509b4e21066c1bdc0530a5b2a3df84..7073162664f30f46a8274c15e894bb18f6137356 100644 (file)
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -30,7 +30,7 @@
                                         "Object not initialized"); \
                                 return False; \
                             }
-#define _VALIDATE_TRI(f)    if(!f) { \
+#define _VALIDATE_INT(f)    if(!f) { \
                                 zck_log(ZCK_LOG_NONE, \
                                         "Object not initialized"); \
                                 return -1; \
@@ -42,7 +42,7 @@
                             }
 #define VALIDATE_BOOL(f)    _VALIDATE_BOOL(f) \
                             if((f)->error_state > 0) return False;
-#define VALIDATE_TRI(f)     _VALIDATE_TRI(f) \
+#define VALIDATE_INT(f)     _VALIDATE_INT(f) \
                             if((f)->error_state > 0) return -1;
 #define VALIDATE_CHAR(f)    _VALIDATE_CHAR(f) \
                             if((f)->error_state > 0) return NULL;
@@ -53,7 +53,7 @@
                                         "zckCtx not opened for reading"); \
                                     return False; \
                                 }
-#define VALIDATE_READ_TRI(f)    VALIDATE_TRI(f); \
+#define VALIDATE_READ_INT(f)    VALIDATE_INT(f); \
                                 if(f->mode != ZCK_MODE_READ) { \
                                     set_error(f, \
                                         "zckCtx not opened for reading"); \
@@ -72,7 +72,7 @@
                                         "zckCtx not opened for writing"); \
                                     return False; \
                                 }
-#define VALIDATE_WRITE_TRI(f)   VALIDATE_TRI(f); \
+#define VALIDATE_WRITE_INT(f)   VALIDATE_INT(f); \
                                 if(f->mode != ZCK_MODE_WRITE) { \
                                     set_error(f, \
                                         "zckCtx not opened for writing"); \