Rename VALIDATE_*_CHAR to VALIDATE_*_PTR

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

diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c
index 29498b1aba3a9901e2b6de079254c808b31e4624..a9bd88ec2a14e43ea7a6f74b3fb2d4ce85041c36 100644 (file)
--- a/src/lib/dl/dl.c
+++ b/src/lib/dl/dl.c
@@ -327,7 +327,7 @@ void PUBLIC zck_dl_free(zckDL **dl) {
 }
 
 zckCtx PUBLIC *zck_dl_get_zck(zckDL *dl) {
-    _VALIDATE_CHAR(dl);
+    _VALIDATE_PTR(dl);
 
     return dl->zck;
 }
@@ -346,7 +346,7 @@ int PUBLIC zck_dl_set_range(zckDL *dl, zckRange *range) {
 }
 
 zckRange PUBLIC *zck_dl_get_range(zckDL *dl) {
-    _VALIDATE_CHAR(dl);
+    _VALIDATE_PTR(dl);
 
     return dl->range;
 }

diff --git a/src/lib/dl/multipart.c b/src/lib/dl/multipart.c
index b616d7d89e63e5794710710983bff57889047d6e..fef9e07d41c9d67853e6ad01bbda1531b1e6ba38 100644 (file)
--- a/src/lib/dl/multipart.c
+++ b/src/lib/dl/multipart.c
@@ -35,7 +35,7 @@
 
 static char *add_boundary_to_regex(zckCtx *zck, const char *regex,
                                    const char *boundary) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     if(regex == NULL || boundary == NULL)
         return NULL;

diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c
index d8b8b888949fde5e495af436f2ef38724b6b42b4..9927d72507e336439752ec375891f59bb82e6740 100644 (file)
--- a/src/lib/dl/range.c
+++ b/src/lib/dl/range.c
@@ -38,7 +38,7 @@ static zckRangeItem *range_insert_new(zckCtx *zck, zckRangeItem *prev,
                                       zckRangeItem *next, uint64_t start,
                                       uint64_t end, zckRange *info,
                                       zckChunk *idx, int add_index) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     zckRangeItem *new = zmalloc(sizeof(zckRangeItem));
     if(!new) {
@@ -196,7 +196,7 @@ char PUBLIC *zck_get_range_char(zckCtx *zck, zckRange *range) {
 }
 
 zckRange PUBLIC *zck_get_missing_range(zckCtx *zck, int max_ranges) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     zckRange *range = zmalloc(sizeof(zckRange));
     if(range == NULL) {

diff --git a/src/lib/hash/hash.c b/src/lib/hash/hash.c
index b062588b2717c8d350948f5cb140f2c7d71c2300..2f4585206d1f401945aa96f26c036c4d15ebb737 100644 (file)
--- a/src/lib/hash/hash.c
+++ b/src/lib/hash/hash.c
@@ -503,13 +503,13 @@ ssize_t PUBLIC zck_get_chunk_digest_size(zckCtx *zck) {
 }
 
 char PUBLIC *zck_get_header_digest(zckCtx *zck) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     return get_digest_string(zck->header_digest, zck->hash_type.digest_size);
 }
 
 char PUBLIC *zck_get_data_digest(zckCtx *zck) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     return get_digest_string(zck->full_hash_digest, zck->hash_type.digest_size);
 }

diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c
index 5a80dca559e824dc3846a2873b4767e3bc7ff624..9625b577f01347bef9eb30b1e7d37691a14acdab 100644 (file)
--- a/src/lib/index/index_read.c
+++ b/src/lib/index/index_read.c
@@ -127,13 +127,13 @@ ssize_t PUBLIC zck_get_chunk_count(zckCtx *zck) {
 }
 
 zckChunk PUBLIC *zck_get_first_chunk(zckCtx *zck) {
-    VALIDATE_CHAR(zck);
+    VALIDATE_PTR(zck);
 
     return zck->index.first;
 }
 
 zckChunk PUBLIC *zck_get_next_chunk(zckChunk *idx) {
-    _VALIDATE_CHAR(idx);
+    _VALIDATE_PTR(idx);
 
     return idx->next;
 }

diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index 7073162664f30f46a8274c15e894bb18f6137356..5dbeedce802a4fbfc15a1c47917e84e8d0bb7f35 100644 (file)
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -35,7 +35,7 @@
                                         "Object not initialized"); \
                                 return -1; \
                             }
-#define _VALIDATE_CHAR(f)   if(!f) { \
+#define _VALIDATE_PTR(f)    if(!f) { \
                                 zck_log(ZCK_LOG_NONE, \
                                         "Object not initialized"); \
                                 return NULL; \
@@ -44,7 +44,7 @@
                             if((f)->error_state > 0) return False;
 #define VALIDATE_INT(f)     _VALIDATE_INT(f) \
                             if((f)->error_state > 0) return -1;
-#define VALIDATE_CHAR(f)    _VALIDATE_CHAR(f) \
+#define VALIDATE_PTR(f)     _VALIDATE_PTR(f) \
                             if((f)->error_state > 0) return NULL;
 
 #define VALIDATE_READ_BOOL(f)   VALIDATE_BOOL(f); \
@@ -59,7 +59,7 @@
                                         "zckCtx not opened for reading"); \
                                     return -1; \
                                 }
-#define VALIDATE_READ_CHAR(f)   VALIDATE_CHAR(f); \
+#define VALIDATE_READ_PTR(f)    VALIDATE_PTR(f); \
                                 if(f->mode != ZCK_MODE_READ) { \
                                     set_error(f, \
                                         "zckCtx not opened for reading"); \
@@ -78,7 +78,7 @@
                                         "zckCtx not opened for writing"); \
                                     return -1; \
                                 }
-#define VALIDATE_WRITE_CHAR(f)  VALIDATE_CHAR(f); \
+#define VALIDATE_WRITE_PTR(f)   VALIDATE_PTR(f); \
                                 if(f->mode != ZCK_MODE_WRITE) { \
                                     set_error(f, \
                                         "zckCtx not opened for writing"); \