remove legacy print nested, and old "unflatten" code

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index fe41cc1787afb4a971e33cf0c7fad339e75b8076..f50ef0036c17b33299518f4b890cc9dff3e05368 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -32,8 +32,6 @@ RCSID("$Id$")
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
-bool fr_pair_legacy_print_nested = false;
-
 static fr_sbuff_term_t const   bareword_terminals =
                                FR_SBUFF_TERMS(
                                        L("\t"),

diff --git a/src/lib/util/pair_legacy.h b/src/lib/util/pair_legacy.h
index faa51c89bffd2016af9b9d8f0d53f53a5e8668bd..105fda81ffc47ee8dc3176da291323cc29697a72 100644 (file)
--- a/src/lib/util/pair_legacy.h
+++ b/src/lib/util/pair_legacy.h
@@ -34,8 +34,6 @@ RCSIDH(pair_legacy_h, "$Id$")
 extern "C" {
 #endif
 
-extern bool    fr_pair_legacy_print_nested; /* printing: for migration from legacy flat to new nested */
-
 fr_token_t     fr_pair_list_afrom_str(TALLOC_CTX *ctx, fr_dict_attr_t const *parent,
                                       char const *buffer, size_t len, fr_pair_list_t *head);
 int            fr_pair_list_afrom_file(TALLOC_CTX *ctx, fr_dict_t const *dict,

diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c
index b59992ea437c13cc03831c0a65cde0dde6ff989d..2dd0de64d75413c8268a6705b8da65e482dd3b63 100644 (file)
--- a/src/lib/util/pair_print.c
+++ b/src/lib/util/pair_print.c
@@ -201,141 +201,6 @@ ssize_t fr_pair_print_secure(fr_sbuff_t *out, fr_dict_attr_t const *parent, fr_p
        FR_SBUFF_SET_RETURN(out, &our_out);
 }
 
-static ssize_t fr_pair_list_print_unflatten(fr_sbuff_t *out, fr_dict_attr_t const *parent, fr_pair_list_t const *list, fr_pair_t **vp_p)
-{
-       bool            comma = false;
-       fr_pair_t       *vp = *vp_p;
-       fr_pair_t       *next = fr_pair_list_next(list, vp);
-       fr_da_stack_t   da_stack;
-       fr_sbuff_t      our_out = FR_SBUFF(out);
-
-       fr_proto_da_stack_build(&da_stack, vp->da);
-
-       fr_assert(fr_type_is_structural(parent->type) || fr_dict_attr_is_key_field(parent));
-
-redo:
-       /*
-        *      Not yet at the correct parent.  Print out the wrapper, and keep looping while the parent is the same.
-        */
-       if (fr_type_is_leaf(vp->vp_type) && (da_stack.da[parent->depth - 1] == parent) && (vp->da->parent != parent)) {
-               if (comma) FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, ", ");
-
-               fr_assert(da_stack.da[parent->depth] != NULL);
-
-               FR_SBUFF_IN_STRCPY_RETURN(&our_out, da_stack.da[parent->depth]->name);
-               FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, " = { ");
-
-               while (true) {
-                       fr_pair_t *prev = vp;
-
-                       FR_SBUFF_RETURN(fr_pair_list_print_unflatten, &our_out, da_stack.da[parent->depth], list, &vp);
-
-                       if (!vp) break;
-
-                       if (vp->da->depth <= parent->depth) break;
-
-                       /*
-                        *      Flat structures are listed in order.  Which means as soon as we go from 1..N back to
-                        *      1, we have ended the current structure.
-                        */
-                       if ((prev->da->parent->type == FR_TYPE_STRUCT) &&
-                           (vp->da->parent == prev->da->parent) &&
-                           (vp->da->attr < prev->da->attr)) {
-                               break;
-                       }
-
-                       /*
-                        *      We have different parents, stop printing.
-                        */
-                       fr_proto_da_stack_build(&da_stack, vp->da);
-
-                       if (da_stack.da[parent->depth - 1] != parent) break;
-               }
-
-               /*
-                *      We've either hit the end of the list, OR a VP which has a different parent, OR the end
-                *      of this struct.
-                */
-               FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, " }");
-
-               if (vp) {
-                       next = fr_pair_list_next(list, vp);
-                       if (next) comma = true;
-               } else {
-                       next = NULL;
-               }
-
-               *vp_p = next;
-
-               if (!next) {
-                       FR_SBUFF_SET_RETURN(out, &our_out);
-               }
-
-               vp = next;
-       }
-
-       /*
-        *      Print out things which are at the root.
-        */
-       while (vp->da->parent->flags.is_root) {
-               if (comma) FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, ", ");
-
-               FR_SBUFF_RETURN(fr_pair_print, &our_out, vp->da->parent, vp);
-               next = fr_pair_list_next(list, vp);
-               if (!next) goto done;
-
-               comma = true;
-               vp = next;
-       }
-
-       /*
-        *      Allow nested attributes to be mixed with flat attributes.
-        */
-       while (fr_type_is_structural(vp->vp_type) && (vp->da == parent)) {
-               if (comma) FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, ", ");
-
-               FR_SBUFF_RETURN(fr_pair_print, &our_out, vp->da->parent, vp);
-               next = fr_pair_list_next(list, vp);
-               if (!next) goto done;
-
-               comma = true;
-               vp = next;
-       }
-
-       fr_assert(vp->da->parent == parent);
-
-       /*
-        *      Finally loop over the correct children.
-        */
-       while (vp->da->parent == parent) {
-               if (comma) FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, ", ");
-
-               FR_SBUFF_RETURN(fr_pair_print, &our_out, vp->da->parent, vp);
-               next = fr_pair_list_next(list, vp);
-               if (!next) goto done;
-
-               comma = true;
-               vp = next;
-       }
-
-       /*
-        *      We've printed out all of the VPs at the current depth.  But maybe the next VP is at a
-        *      different depth.  If so, jump back and keep going.
-        */
-       if (next) {
-               fr_proto_da_stack_build(&da_stack, next->da);
-               if (da_stack.da[parent->depth - 1] == parent) {
-                       vp = next;
-                       goto redo;
-               }
-       }
-
-done:
-       *vp_p = next;
-
-       FR_SBUFF_SET_RETURN(out, &our_out);
-}
-
 /** Print a pair list
  *
  * @param[in] out      Where to write the string.
@@ -362,39 +227,8 @@ ssize_t fr_pair_list_print(fr_sbuff_t *out, fr_dict_attr_t const *parent, fr_pai
        if (parent && (parent->type == FR_TYPE_GROUP)) parent = NULL;
 
        while (true) {
-               unsigned int depth;
-               fr_da_stack_t da_stack;
-
-               fr_proto_da_stack_build(&da_stack, vp->da);
-
-               if (!fr_pair_legacy_print_nested ||
-                   (!parent && (vp->da->depth == 1)) ||
-                   fr_dict_attr_is_key_field(vp->da->parent) ||
-                   (vp->da->parent == parent) ||
-                   (parent && (fr_dict_by_da(parent) != fr_dict_by_da(vp->da))) ||
-                   (parent && (da_stack.da[parent->depth] == parent) && (parent->depth + 1 == vp->da->depth))) {
-                       FR_SBUFF_RETURN(fr_pair_print, &our_out, parent, vp);
-                       vp = fr_pair_list_next(list, vp);
-               } else {
-                       /*
-                        *      We have to print a partial tree, starting from the root.
-                        */
-                      if (!parent) {
-                              depth = 1;
-                      } else {
-                              depth = parent->depth + 1;
-                      }
-
-                     /*
-                      *        Wrap the children.
-                      */
-                     FR_SBUFF_IN_STRCPY_RETURN(&our_out, da_stack.da[depth - 1]->name);
-                     FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, " = { ");
-
-                     FR_SBUFF_RETURN(fr_pair_list_print_unflatten, &our_out, da_stack.da[depth - 1], list, &vp);
-                     FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, " }");
-               }
-
+               FR_SBUFF_RETURN(fr_pair_print, &our_out, parent, vp);
+               vp = fr_pair_list_next(list, vp);
                if (!vp) break;
 
                FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, ", ");