no need for "tmp" in the name. It's just "append"

diff --git a/src/lib/curl/base.c b/src/lib/curl/base.c
index 41a3add7d0436b7b96e54c1bc105f032e4bf0fa5..3e1cc59e14c256d7527c0f31997ad0af2524bea0 100644 (file)
--- a/src/lib/curl/base.c
+++ b/src/lib/curl/base.c
@@ -215,7 +215,7 @@ int fr_curl_response_certinfo(request_t *request, fr_curl_io_request_t *randle)
                         *      Print out all the pairs we have so far
                         */
                        log_request_pair_list(L_DBG_LVL_2, request, NULL, &cert_vps, NULL);
-                       fr_tmp_pair_list_move(&request->request_pairs, &cert_vps);
+                       fr_pair_list_append(&request->request_pairs, &cert_vps);
                }
        }
        return 0;

diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index aa30de6080b510ffe04b82e287b0728223e15cf7..c2957c9a9eed6b55e69d5dfa3bb5761f53372e3e 100644 (file)
--- a/src/lib/ldap/map.c
+++ b/src/lib/ldap/map.c
@@ -133,7 +133,7 @@ int fr_ldap_map_getvalue(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *reques
                                goto next_pair;
                        }
 
-                       fr_tmp_pair_list_move(&head, &tmp_list);
+                       fr_pair_list_append(&head, &tmp_list);
                        talloc_free(attr);
 
                        /*
@@ -178,7 +178,7 @@ int fr_ldap_map_getvalue(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *reques
                fr_assert(0);
        }
 
-       fr_tmp_pair_list_move(out, &head);
+       fr_pair_list_append(out, &head);
 
        return 0;
 }

diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c
index 436c907dc003585d2a678c8ca9d197f645e55324..61d1de9ef42ee491625be918e3d113cbe9faad6d 100644 (file)
--- a/src/lib/server/exec.c
+++ b/src/lib/server/exec.c
@@ -621,7 +621,7 @@ int radius_exec_program(TALLOC_CTX *ctx, char *out, size_t outlen, fr_pair_list_
                 *      but not the existing ones.
                 */
                fr_pair_list_tainted(&vps);
-               fr_tmp_pair_list_move(output_pairs, &vps);
+               fr_pair_list_append(output_pairs, &vps);
 
        } else if (out) {
                /*

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index a58290646d69afd7d7084a77737156bfac4e4d37..f1ec2c78b32107a47391b1dfe9be8e6b464935f3 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -858,7 +858,7 @@ static int map_exec_to_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *reque
                        REDEBUG("No valid attributes received from program");
                        return -2;
                }
-               fr_tmp_pair_list_move(out, &output_pairs);
+               fr_pair_list_append(out, &output_pairs);
                return 0;
 
        case TMPL_TYPE_ATTR:
@@ -943,7 +943,7 @@ int map_to_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *request, map_t co
                        vp->op = T_OP_ADD;
                }
 
-               fr_tmp_pair_list_move(out, &found);
+               fr_pair_list_append(out, &found);
 
                return 0;
        }
@@ -1053,7 +1053,7 @@ int map_to_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *request, map_t co
                        vp->da = tmpl_da(map->lhs);
                        vp->op = map->op;
                }
-               fr_tmp_pair_list_move(out, &found);
+               fr_pair_list_append(out, &found);
        }
                break;
 
@@ -1305,7 +1305,7 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
                case T_OP_SET:
                        if (tmpl_is_list(map->rhs)) {
                                fr_pair_list_free(list);
-                               fr_tmp_pair_list_move(list, &src_list);
+                               fr_pair_list_append(list, &src_list);
                                fr_pair_list_init(&src_list);
                        } else {
                                FALL_THROUGH;

diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 3db6732b88e635c7eb9febe4596875aaf24a44b1..f4c7c54447c425b26dec0154299903612ec4e3ce 100644 (file)
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -1026,7 +1026,7 @@ int map_list_mod_apply(request_t *request, vp_list_mod_t const *vlm)
                        fr_pair_list_init(&tmp_list);
                        fr_pair_list_free(vp_list);                             /* Clear the existing list */
                        map_list_mod_to_vps(parent, &tmp_list, vlm);            /* Replace with a new list */
-                       fr_tmp_pair_list_move(vp_list, &tmp_list);
+                       fr_pair_list_append(vp_list, &tmp_list);
                        goto finish;
                }
 
@@ -1080,7 +1080,7 @@ int map_list_mod_apply(request_t *request, vp_list_mod_t const *vlm)
                        map_list_mod_to_vps(parent, &vp_from, vlm);
                        fr_assert(!fr_pair_list_empty(&vp_from));
 
-                       fr_tmp_pair_list_move(vp_list, &vp_from);
+                       fr_pair_list_append(vp_list, &vp_from);
                }
                        goto finish;
 
@@ -1197,7 +1197,7 @@ int map_list_mod_apply(request_t *request, vp_list_mod_t const *vlm)
                map_list_mod_to_vps(parent, &vp_from, vlm);
                if (fr_pair_list_empty(&vp_from)) goto finish;
 
-               fr_tmp_pair_list_move(vp_list, &vp_from);
+               fr_pair_list_append(vp_list, &vp_from);
        }
                goto finish;
 

diff --git a/src/lib/server/pairmove.c b/src/lib/server/pairmove.c
index 0f9564ac549aa754113ca3c747f9d38dea47d881..cd14c7aa14a9129ff8f595fcf036da776f3b9fd6 100644 (file)
--- a/src/lib/server/pairmove.c
+++ b/src/lib/server/pairmove.c
@@ -299,7 +299,7 @@ void radius_pairmove(request_t *request, fr_pair_list_t *to, fr_pair_list_t *fro
         *      And finally add in the attributes we're appending to
         *      the tail of the "to" list.
         */
-       fr_tmp_pair_list_move(to, &append);
+       fr_pair_list_append(to, &append);
 
        fr_assert(request->packet != NULL);
 

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index 4557080069e0238455a528ba9b3807e725b62ac5..4f565b257e008654dda64d309846da0d19900c32 100644 (file)
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -168,7 +168,7 @@ int fr_tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
                         *      Print out all the pairs we have so far
                         */
                        log_request_pair_list(L_DBG_LVL_2, request, NULL, &cert_vps, "&session-state.");
-                       fr_tmp_pair_list_move(&request->session_state_pairs, &cert_vps);
+                       fr_pair_list_append(&request->session_state_pairs, &cert_vps);
                }
        }
 

diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c
index a189479099ea2a43e5f0cface9bbf61d94a02f3c..886f9063dcdcdb1b5ca83e53ffd4935e2e834b1b 100644 (file)
--- a/src/lib/unlang/foreach.c
+++ b/src/lib/unlang/foreach.c
@@ -168,7 +168,7 @@ static unlang_action_t unlang_foreach(rlm_rcode_t *p_result, request_t *request,
 
        foreach->request = request;
        foreach->depth = foreach_depth;
-       fr_tmp_pair_list_move(&foreach->vps, &vps);
+       fr_pair_list_append(&foreach->vps, &vps);
        fr_dcursor_talloc_init(&foreach->cursor, &foreach->vps, fr_pair_t);
 #ifndef NDEBUG
        foreach->indent = request->log.unlang_indent;

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 81535166f1db8971901066ab3827d9987bf8940d..05ef888810c35a5ef740fe2ca8261356441d4c22 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -1434,7 +1434,7 @@ int fr_pair_list_copy(TALLOC_CTX *ctx, fr_pair_list_t *to, fr_pair_list_t const
                fr_pair_append(&tmp_list, new_vp);
        }
 
-       fr_tmp_pair_list_move(to, &tmp_list);
+       fr_pair_list_append(to, &tmp_list);
 
        return cnt;
 }
@@ -1484,7 +1484,7 @@ int fr_pair_list_copy_by_da(TALLOC_CTX *ctx, fr_pair_list_t *to,
                fr_pair_append(&tmp_list, new_vp); /* fr_pair_list_copy sets next pointer to NULL */
        }
 
-       fr_tmp_pair_list_move(to, &tmp_list);
+       fr_pair_list_append(to, &tmp_list);
 
        return cnt;
 }
@@ -2558,14 +2558,14 @@ void fr_pair_list_afrom_box(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_t cons
        fr_pair_list_tainted(out);
 }
 
-/** Move a list of fr_pair_t from a temporary list to a destination list
+/** Appends a list of fr_pair_t from a temporary list to a destination list
  *
  * @param dst list to move pairs into
- * @param tmp_list from which to take pairs
+ * @param src list from which to take pairs
  */
-void fr_tmp_pair_list_move(fr_pair_list_t *dst, fr_pair_list_t *tmp_list)
+void fr_pair_list_append(fr_pair_list_t *dst, fr_pair_list_t *src)
 {
-       fr_dlist_move(&dst->head, &tmp_list->head);
+       fr_dlist_move(&dst->head, &src->head);
 }
 
 /** Evaluation function for matching if vp matches a given da

diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 0b765fe63db7b7640d41b486b715a255d407e98c..6b591480de62804a9bbc47cf4ab9c0ce65cf3c23 100644 (file)
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -292,7 +292,7 @@ int         fr_pair_list_copy_by_da(TALLOC_CTX *ctx, fr_pair_list_t *to,
 int            fr_pair_list_copy_by_ancestor(TALLOC_CTX *ctx, fr_pair_list_t *to,
                                              fr_pair_list_t *from, fr_dict_attr_t const *parent_da, unsigned int count);
 int            fr_pair_sublist_copy(TALLOC_CTX *ctx, fr_pair_list_t *to, fr_pair_list_t const *from, fr_pair_t *item);
-void           fr_tmp_pair_list_move(fr_pair_list_t *dst, fr_pair_list_t *tmp_list);
+void           fr_pair_list_append(fr_pair_list_t *dst, fr_pair_list_t *src);
 
 /** @hidecallergraph */
 void           *fr_pair_list_head(fr_pair_list_t const *list);

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index c04324ca9764c6b2f36adf67755957f758ee5409..df2ad136469a54cc2a71f0525be8efded34e2279 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -532,7 +532,7 @@ static ssize_t fr_pair_list_afrom_substr(TALLOC_CTX *ctx, fr_dict_attr_t const *
                last_token = T_COMMA;
        }
 
-       if (!fr_pair_list_empty(&tmp_list)) fr_tmp_pair_list_move(list, &tmp_list);
+       if (!fr_pair_list_empty(&tmp_list)) fr_pair_list_append(list, &tmp_list);
 
        /*
         *      And return the last token which we read.
@@ -620,7 +620,7 @@ int fr_pair_list_afrom_file(TALLOC_CTX *ctx, fr_dict_t const *dict, fr_pair_list
                }
 
                found = true;
-               fr_tmp_pair_list_move(out, &tmp_list);
+               fr_pair_list_append(out, &tmp_list);
        }
 
        *pfiledone = true;
@@ -732,5 +732,5 @@ void fr_pair_list_move(fr_pair_list_t *to, fr_pair_list_t *from)
        /*
         *      Take the "new" list, and append it to the "to" list.
         */
-       fr_tmp_pair_list_move(to, &head_new);
+       fr_pair_list_append(to, &head_new);
 }

diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index bceace3d30e1936dfdde1244ce0d14ef3b117d99..cb297282daca98f28f8ea0fea18803b2132d6686 100644 (file)
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -297,7 +297,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d
                fr_pair_list_free(&tmp_list);
                if ((fr_pair_list_afrom_str(request->request_ctx, request->dict, (char const *) p, &tmp_list) > 0) && !fr_pair_list_empty(&tmp_list)) {
                        vp = fr_pair_list_head(&tmp_list);
-                       fr_tmp_pair_list_move(&request->request_pairs, &tmp_list);
+                       fr_pair_list_append(&request->request_pairs, &tmp_list);
                } else {
                        vp = NULL;
                        RWDEBUG("Ignoring line %d - :%s", lineno, p);

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index 34481aaa203c049500f4c564acf525e65c26d6f6..cbfeccd3a475a23ee26780cb463f2e39f3a0af90 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -343,7 +343,7 @@ static unlang_action_t CC_HINT(nonnull(1,2)) attr_filter_common(rlm_rcode_t *p_r
         *      Replace the existing request list with our filtered one
         */
        fr_pair_list_free(list);
-       fr_tmp_pair_list_move(list, &output);
+       fr_pair_list_append(list, &output);
 
        RETURN_MODULE_UPDATED;
 }

diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c
index 3c76942bd7e766e1f6a81d0c48ddf46ea5fa98fc..29bd433afaa91cf48dbb5247d8a00883d06d6b64 100644 (file)
--- a/src/modules/rlm_client/rlm_client.c
+++ b/src/modules/rlm_client/rlm_client.c
@@ -96,7 +96,7 @@ static int _map_proc_client_get_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request
                if (map->op != T_OP_ADD) break; /* Create multiple attribute for multiple CONF_PAIRs */
        }
 
-       fr_tmp_pair_list_move(out, &head);
+       fr_pair_list_append(out, &head);
 
        return 0;
 }

diff --git a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
index 7fb752c3c63b5c5a66752098a129e53ed93810e7..7a03b683756f3cb8c94c8c0fcc7476b8ebdd4d4a 100644 (file)
--- a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
+++ b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
@@ -110,7 +110,7 @@ static xlat_action_t dhcpv4_decode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                        }
                        p += len;
                }
-               fr_tmp_pair_list_move(&head, &vps);
+               fr_pair_list_append(&head, &vps);
        }
 
        while ((vp = fr_pair_list_next(&head, vp))) {

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index f15f71f70c684933c9922b8ac3ea801e29749985..3542ed0e538188cf58b048584ff8c2e147346f4a 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -382,7 +382,7 @@ static unlang_action_t file_common(rlm_rcode_t *p_result, rlm_files_t const *ins
                        }
                        LIST_VERIFY(&tmp_list);
 
-                       fr_tmp_pair_list_move(&list, &tmp_list);
+                       fr_pair_list_append(&list, &tmp_list);
                }
 
                if (paircmp(request, &request->request_pairs, &list) != 0) {

diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index 99fd6149faedd9668f9bfcd6fdc991c9974892fb..8f765d471828b4cade498a14801b076f51e73034 100644 (file)
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -262,7 +262,7 @@ static xlat_action_t json_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, reques
                        fr_pair_list_free(&vps);
                } else {
                        /* Add template VPs to JSON list */
-                       fr_tmp_pair_list_move(&json_vps, &vps);
+                       fr_pair_list_append(&json_vps, &vps);
                }
 
                TALLOC_FREE(vpt);

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index c20654b95880291b242dbaef7e49d75aa1f1c9d6..8669363cb9025b6b3c57b63a0f0325588dc10542 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -402,7 +402,7 @@ unlang_action_t rlm_ldap_cacheable_userobj(rlm_rcode_t *p_result, rlm_ldap_t con
                }
        }
 
-       fr_tmp_pair_list_move(list, &groups);
+       fr_pair_list_append(list, &groups);
 
        for (dn_p = group_dn; *dn_p; dn_p++) {
                MEM(vp = fr_pair_afrom_da(list_ctx, inst->cache_da));

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 2d7363a44921021b15922cdae04ec7f3d4a3bead..0e30373f2745fcae97027a41a2ce5a94fd3ac699 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -914,25 +914,25 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, void *instance, request_t
                fr_pair_list_init(&vps);
                if ((get_hv_content(request->request_ctx, request, rad_request_hv, &vps, "RAD_REQUEST", "request")) == 0) {
                        fr_pair_list_free(&request->request_pairs);
-                       fr_tmp_pair_list_move(&request->request_pairs, &vps);
+                       fr_pair_list_append(&request->request_pairs, &vps);
                        fr_pair_list_init(&vps);
                }
 
                if ((get_hv_content(request->reply_ctx, request, rad_reply_hv, &vps, "RAD_REPLY", "reply")) == 0) {
                        fr_pair_list_free(&request->reply_pairs);
-                       fr_tmp_pair_list_move(&request->reply_pairs, &vps);
+                       fr_pair_list_append(&request->reply_pairs, &vps);
                        fr_pair_list_init(&vps);
                }
 
                if ((get_hv_content(request->control_ctx, request, rad_config_hv, &vps, "RAD_CONFIG", "control")) == 0) {
                        fr_pair_list_free(&request->control_pairs);
-                       fr_tmp_pair_list_move(&request->control_pairs, &vps);
+                       fr_pair_list_append(&request->control_pairs, &vps);
                        fr_pair_list_init(&vps);
                }
 
                if ((get_hv_content(request->session_state_ctx, request, rad_state_hv, &vps, "RAD_STATE", "session-state")) == 0) {
                        fr_pair_list_free(&request->session_state_pairs);
-                       fr_tmp_pair_list_move(&request->session_state_pairs, &vps);
+                       fr_pair_list_append(&request->session_state_pairs, &vps);
                        fr_pair_list_init(&vps);
                }
        }

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 31970f3731db7b1389a4951f0ad854819478aaf1..b836799a7fd192f244cf76365a38652ca438d53d 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -2463,7 +2463,7 @@ static void request_demux(fr_trunk_connection_t *tconn, fr_connection_t *conn, U
 
                treq->request->reply->code = code;
                r->rcode = radius_code_to_rcode[code];
-               fr_tmp_pair_list_move(&request->reply_pairs, &reply);
+               fr_pair_list_append(&request->reply_pairs, &reply);
                fr_trunk_request_signal_complete(treq);
        }
 }

diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index 4f83b730a7971692433704d3d62a78aa1eecfddf..e2c353b8468e9893d0609e09ab2008d76b3f50b8 100644 (file)
--- a/src/protocols/dhcpv6/decode.c
+++ b/src/protocols/dhcpv6/decode.c
@@ -259,7 +259,7 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_dcursor_t *cursor, fr_dict_t con
                        talloc_free(vp);
                        goto raw;
                }
-               fr_tmp_pair_list_move(&vp->vp_group, &head);
+               fr_pair_list_append(&vp->vp_group, &head);
                break;
        }
 

diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c
index 1c18dfc9b1d40a170df166ad8adf9159ef015404..dcf46e610f68b304b3af40eea9869cdd0d450e91 100644 (file)
--- a/src/protocols/radius/decode.c
+++ b/src/protocols/radius/decode.c
@@ -468,7 +468,7 @@ ssize_t fr_radius_decode_tlv(TALLOC_CTX *ctx, fr_dcursor_t *cursor, fr_dict_t co
                p += p[1];
        }
 
-       fr_tmp_pair_list_move(&vp->vp_group, &head);
+       fr_pair_list_append(&vp->vp_group, &head);
        fr_dcursor_append(cursor, vp);
 
        return data_len;