tweaks for name normalization

diff --git a/src/bin/radict.c b/src/bin/radict.c
index 646c727293efc6c076dc809c408f2a914fdbb3aa..352785dbcd3869dd9823689afeb95d891cae1ad4 100644 (file)
--- a/src/bin/radict.c
+++ b/src/bin/radict.c
@@ -319,7 +319,7 @@ static char const *length_to_c_type[] = {
        [8] = "uint64_t",
 };
 
-static void da_normalize_name(fr_dict_attr_t const *da, char buffer[static FR_DICT_ATTR_MAX_NAME_LEN + 1])
+static void da_normalize_name(fr_dict_attr_t const *da, char buffer[static FR_DICT_ATTR_MAX_NAME_LEN*2 + 1])
 {
        char const *start = da->name;
        char const *p;
@@ -382,7 +382,7 @@ static void da_normalize_name(fr_dict_attr_t const *da, char buffer[static FR_DI
 
 static void da_print_name(FILE *fp, fr_dict_attr_t const *da)
 {
-       char buffer[FR_DICT_ATTR_MAX_NAME_LEN + 1];
+       char buffer[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
 
        da_normalize_name(da, buffer);
        fprintf(fp, "%s", buffer);
@@ -505,7 +505,7 @@ static void da_print_base_c_da_def(FILE *fp, fr_dict_attr_t const *parent)
 {
        int i;
        fr_dict_attr_t const *da;
-       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
+       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
 
        CHECK_TYPE(parent);
 
@@ -576,8 +576,8 @@ static void da_print_stats_link(FILE *fp, fr_dict_attr_t const *parent)
 {
        int i, num_elements = 0;
        fr_dict_attr_t const *da;
-       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
-       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
+       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
+       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
 
        CHECK_TYPE(parent);
 
@@ -627,8 +627,8 @@ static void da_print_attr_autoload(FILE *fp, fr_dict_attr_t const *parent)
 {
        int i;
        fr_dict_attr_t const *da;
-       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
-       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
+       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
+       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
 
        CHECK_TYPE(parent);
 
@@ -656,8 +656,8 @@ static void da_print_attr_autoload(FILE *fp, fr_dict_attr_t const *parent)
 
 static void da_print_stats_h(FILE *fp, fr_dict_attr_t const *parent)
 {
-       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
-       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
+       char dict_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
+       char parent_name[FR_DICT_ATTR_MAX_NAME_LEN*2 + 1];
 
        CHECK_TYPE(parent);
 
@@ -888,7 +888,7 @@ int main(int argc, char *argv[])
        if (dict_end == dicts) {
                fr_perror("radict - No dictionaries loaded");
                ret = 1;
-
+               goto finish;
        }
 
        if (print_headers) switch(output_format) {