one more...

FreeRADIUS · May 8, 2020 · 6d2ee15 · 6d2ee15
1 parent c4e8ce5
commit 6d2ee15
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
@@ -1425,7 +1425,7 @@ int cf_section_parse_pass2(void *base, CONF_SECTION *cs)
 			case TMPL_TYPE_XLAT:
 				break;
 
-			case TMPL_TYPE_UNKNOWN:
+			case TMPL_TYPE_UNINITIALISED:
 			case TMPL_TYPE_REGEX_UNPARSED:
 			case TMPL_TYPE_REGEX:
 			case TMPL_TYPE_NULL:

diff --git a/src/lib/server/cond_eval.c b/src/lib/server/cond_eval.c
@@ -556,7 +556,7 @@ do {\
 	 */
 	case TMPL_TYPE_NULL:
 	case TMPL_TYPE_LIST:
-	case TMPL_TYPE_UNKNOWN:
+	case TMPL_TYPE_UNINITIALISED:
 	case TMPL_TYPE_ATTR_UNPARSED:
 	case TMPL_TYPE_REGEX_UNPARSED:	/* Should now be a TMPL_TYPE_REGEX or TMPL_TYPE_XLAT */
 		fr_assert(0);
@@ -667,7 +667,7 @@ int cond_eval_map(REQUEST *request, UNUSED int modreturn, UNUSED int depth, fr_c
 	 */
 	case TMPL_TYPE_NULL:
 	case TMPL_TYPE_ATTR_UNPARSED:
-	case TMPL_TYPE_UNKNOWN:
+	case TMPL_TYPE_UNINITIALISED:
 	case TMPL_TYPE_REGEX_UNPARSED:		/* should now be a TMPL_TYPE_REGEX or TMPL_TYPE_XLAT */
 	case TMPL_TYPE_REGEX:	/* not allowed as LHS */
 		fr_assert(0);

diff --git a/src/lib/server/tmpl.c b/src/lib/server/tmpl.c
@@ -408,7 +408,7 @@ int radius_request(REQUEST **context, request_ref_t name)
 vp_tmpl_t *tmpl_init(vp_tmpl_t *vpt, tmpl_type_t type, char const *name, ssize_t len, FR_TOKEN quote)
 {
 	fr_assert(vpt);
-	fr_assert(type != TMPL_TYPE_UNKNOWN);
+	fr_assert(type != TMPL_TYPE_UNINITIALISED);
 	fr_assert(type <= TMPL_TYPE_NULL);
 
 	memset(vpt, 0, sizeof(vp_tmpl_t));
@@ -438,7 +438,7 @@ vp_tmpl_t *tmpl_alloc(TALLOC_CTX *ctx, tmpl_type_t type, char const *name, ssize
 {
 	vp_tmpl_t *vpt;
 
-	fr_assert(type != TMPL_TYPE_UNKNOWN);
+	fr_assert(type != TMPL_TYPE_UNINITIALISED);
 	fr_assert(type <= TMPL_TYPE_NULL);
 
 #ifndef HAVE_REGEX
@@ -1669,7 +1669,7 @@ ssize_t _tmpl_to_type(void *out,
 	/*
 	 *	We should never be expanding these.
 	 */
-	case TMPL_TYPE_UNKNOWN:
+	case TMPL_TYPE_UNINITIALISED:
 	case TMPL_TYPE_NULL:
 	case TMPL_TYPE_LIST:
 	case TMPL_TYPE_REGEX_UNPARSED:
@@ -2000,7 +2000,7 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out,
 	/*
 	 *	We should never be expanding these.
 	 */
-	case TMPL_TYPE_UNKNOWN:
+	case TMPL_TYPE_UNINITIALISED:
 	case TMPL_TYPE_NULL:
 	case TMPL_TYPE_LIST:
 	case TMPL_TYPE_REGEX_UNPARSED:
@@ -2611,7 +2611,7 @@ void tmpl_verify(char const *file, int line, vp_tmpl_t const *vpt)
 
 	if (tmpl_is_unknown(vpt)) {
 		fr_fatal_assert_fail("CONSISTENCY CHECK FAILED %s[%u]: vp_tmpl_t type was "
-				     "TMPL_TYPE_UNKNOWN (uninitialised)", file, line);
+				     "TMPL_TYPE_UNINITIALISED (uninitialised)", file, line);
 	}
 
 	if (vpt->type > TMPL_TYPE_NULL) {
@@ -2846,7 +2846,7 @@ void tmpl_verify(char const *file, int line, vp_tmpl_t const *vpt)
 #endif
 		break;
 
-	case TMPL_TYPE_UNKNOWN:
+	case TMPL_TYPE_UNINITIALISED:
 		fr_fatal_assert_fail("CONSISTENCY CHECK FAILED %s[%u]: TMPL_TYPE_UNKOWN", file, line);
 	}
 }

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
@@ -109,7 +109,7 @@ extern size_t request_ref_table_len;
 /** Types of #vp_tmpl_t
  */
 typedef enum tmpl_type_e {
-	TMPL_TYPE_UNKNOWN = 0,		//!< Uninitialised.
+	TMPL_TYPE_UNINITIALISED = 0,	//!< Uninitialised.
 
 	TMPL_TYPE_NULL,			//!< Has no value.  Usually a placeholder in a binary
 					///< expression that's really a unary expression.
@@ -147,7 +147,7 @@ typedef enum tmpl_type_e {
 
 /** Helpers to verify the type of #vp_tmpl_t
  */
-#define tmpl_is_unknown(vpt) 		(vpt->type == TMPL_TYPE_UNKNOWN)
+#define tmpl_is_unknown(vpt) 		(vpt->type == TMPL_TYPE_UNINITIALISED)
 #define tmpl_is_unparsed(vpt) 		(vpt->type == TMPL_TYPE_UNPARSED)
 #define tmpl_is_xlat(vpt) 		(vpt->type == TMPL_TYPE_XLAT_UNPARSED)
 #define tmpl_is_attr(vpt) 		(vpt->type == TMPL_TYPE_ATTR)