tweak nonnull settings

if dict is NULL, it just defaults to internal

Author: alandekok

src/lib/util/dict.h

@@ -898,9 +898,9 @@ fr_dict_t		*fr_dict_protocol_alloc(fr_dict_t const *parent) CC_HINT(nonnull);
 
 int			fr_dict_protocol_reference(fr_dict_attr_t const **da_p, fr_dict_attr_t const *root, fr_sbuff_t *in) CC_HINT(nonnull);
 
-int			fr_dict_read(fr_dict_t *dict, char const *dict_dir, char const *filename) CC_HINT(nonnull);
+int			fr_dict_read(fr_dict_t *dict, char const *dict_dir, char const *filename) CC_HINT(nonnull(3));
 
-bool			fr_dict_filename_loaded(fr_dict_t const *dict, char const *dict_dir, char const *filename) CC_HINT(nonnull);
+bool			fr_dict_filename_loaded(fr_dict_t const *dict, char const *dict_dir, char const *filename) CC_HINT(nonnull(2,3));
 /** @} */
 
 /** @name Autoloader interface
@@ -983,7 +983,7 @@ fr_dict_t const		*fr_dict_internal(void);
 void			dict_dctx_debug(dict_tokenize_ctx_t *dctx) CC_HINT(nonnull);
 
 int			fr_dict_parse_str(fr_dict_t *dict, char const *str,
-					  fr_dict_attr_t const *parent) CC_HINT(nonnull);
+					  fr_dict_attr_t const *parent) CC_HINT(nonnull(2,3));
 
 ssize_t			fr_dict_valid_name(char const *name, ssize_t len) CC_HINT(nonnull);
 

src/lib/util/dict_tokenize.c

@@ -3859,15 +3859,15 @@ int fr_dict_parse_str(fr_dict_t *dict, char const *input, fr_dict_attr_t const *
 		ret = dict_read_process_value(&dctx, argv + 1, argc - 1, &base_flags);
 
 	} else if (strcasecmp(argv[0], "ATTRIBUTE") == 0) {
-		if (parent && (parent != dict->root)) {
+		if (parent != dict->root) {
 			(void) dict_dctx_push(&dctx, parent, NEST_NONE);
 		}
 
 		ret = dict_read_process_attribute(&dctx,
 						  argv + 1, argc - 1, &base_flags);
 
 	} else if (strcasecmp(argv[0], "DEFINE") == 0) {
-		if (parent && (parent != dict->root)) {
+		if (parent != dict->root) {
 			(void) dict_dctx_push(&dctx, parent, NEST_NONE);
 		}