From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 10 Apr 2018 05:46:08 +0000 (+0600)
Subject: s/VERIFY_DA/DA_VERIFY/
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b984bd9925ea06918e4e8e5beb8421f10b188cd;p=thirdparty%2Ffreeradius-server.git

s/VERIFY_DA/DA_VERIFY/
---

diff --git a/src/include/dict.h b/src/include/dict.h
index e5635039527..734039f5d4e 100644
--- a/src/include/dict.h
+++ b/src/include/dict.h
@@ -185,12 +185,6 @@ typedef struct {
  */
 #define FR_DICT_ATTR_SIZE		(sizeof(fr_dict_attr_t) + FR_DICT_ATTR_MAX_NAME_LEN)
 
-#ifdef WITH_VERIFY_PTR
-#  define VERIFY_DA(_x)		fr_dict_verify(__FILE__,  __LINE__, _x)
-#else
-#  define VERIFY_DA(_x)		fr_cond_assert(_x)
-#endif
-
 /** Characters that are allowed in dictionary attribute names
  *
  */
diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c
index 3b399cb987a..2209f58407e 100644
--- a/src/lib/util/dict.c
+++ b/src/lib/util/dict.c
@@ -1224,7 +1224,7 @@ static fr_dict_attr_t *dict_attr_alloc(TALLOC_CTX *ctx,
 	}
 
 	dict_attr_init(n, parent, attr, type, flags);
-	VERIFY_DA(n);
+	DA_VERIFY(n);
 
 	return n;
 }
@@ -1245,7 +1245,7 @@ static fr_dict_attr_t *dict_attr_acopy(TALLOC_CTX *ctx, fr_dict_attr_t const *in
 	if (!n) return NULL;
 
 	dict_attr_init(n, in->parent, in->attr, in->type, &in->flags);
-	VERIFY_DA(n);
+	DA_VERIFY(n);
 
 	return n;
 }
@@ -1434,7 +1434,7 @@ static inline int dict_attr_child_add(fr_dict_attr_t *parent, fr_dict_attr_t *ch
 	child->parent = parent;
 	child->depth = parent->depth + 1;
 
-	VERIFY_DA(child);
+	DA_VERIFY(child);
 
 	/*
 	 *	We only allocate the pointer array *if* the parent has children.
@@ -3085,7 +3085,7 @@ fr_dict_attr_t const *fr_dict_vendor_attr_by_da(fr_dict_attr_t const *da)
 {
 	fr_dict_attr_t const *da_p = da;
 
-	VERIFY_DA(da);
+	DA_VERIFY(da);
 
 	while (da_p->parent) {
 		if (da_p->type == FR_TYPE_VENDOR) break;
@@ -3295,7 +3295,7 @@ fr_dict_attr_t const *fr_dict_attr_child_by_da(fr_dict_attr_t const *parent, fr_
 {
 	fr_dict_attr_t const *bin;
 
-	VERIFY_DA(parent);
+	DA_VERIFY(parent);
 
 	if (!parent->children) return NULL;
 
@@ -3338,7 +3338,7 @@ inline fr_dict_attr_t const *fr_dict_attr_child_by_num(fr_dict_attr_t const *par
 {
 	fr_dict_attr_t const *bin;
 
-	VERIFY_DA(parent);
+	DA_VERIFY(parent);
 
 	if (!parent->children) return NULL;
 
@@ -3619,7 +3619,7 @@ static int dict_root_set(fr_dict_t *dict, char const *name, unsigned int proto_n
 	if (!dict->root) return -1;
 
 	dict_attr_init(dict->root, NULL, proto_number, FR_TYPE_TLV, &flags);
-	VERIFY_DA(dict->root);
+	DA_VERIFY(dict->root);
 
 	return 0;
 }