From: Štěpán Balážik Date: Tue, 1 Sep 2020 07:58:43 +0000 (+0200) Subject: selection: rename *_state_init to *_state_alloc X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c71f95a2b8413d549dfc541c744bc7efdbc5e84f;p=thirdparty%2Fknot-resolver.git selection: rename *_state_init to *_state_alloc --- diff --git a/lib/selection.c b/lib/selection.c index 1af07fe32..129b66744 100644 --- a/lib/selection.c +++ b/lib/selection.c @@ -360,7 +360,7 @@ void kr_server_selection_init(struct kr_query *qry) { .error = forward_error, .local_state = NULL, }; - forward_local_state_init(mempool, &qry->server_selection.local_state, qry->request); + forward_local_state_alloc(mempool, &qry->server_selection.local_state, qry->request); } else { qry->server_selection = (struct kr_server_selection){ .initialized = true, @@ -370,7 +370,7 @@ void kr_server_selection_init(struct kr_query *qry) { .error = iter_error, .local_state = NULL, }; - iter_local_state_init(mempool, &qry->server_selection.local_state); + iter_local_state_alloc(mempool, &qry->server_selection.local_state); } } diff --git a/lib/selection_forward.c b/lib/selection_forward.c index 23385368f..5ed860ea0 100644 --- a/lib/selection_forward.c +++ b/lib/selection_forward.c @@ -14,7 +14,7 @@ struct forward_local_state { size_t last_choice_index; }; -void forward_local_state_init(struct knot_mm *mm, void **local_state, struct kr_request *req) { +void forward_local_state_alloc(struct knot_mm *mm, void **local_state, struct kr_request *req) { assert(req->selection_context.forwarding_targets); *local_state = mm_alloc(mm, sizeof(struct forward_local_state)); memset(*local_state, 0, sizeof(struct forward_local_state)); diff --git a/lib/selection_forward.h b/lib/selection_forward.h index 5a996e0f8..7740d7945 100644 --- a/lib/selection_forward.h +++ b/lib/selection_forward.h @@ -7,7 +7,7 @@ #include "lib/selection.h" #include "lib/resolve.h" -void forward_local_state_init(struct knot_mm *mm, void **local_state, struct kr_request *req); +void forward_local_state_alloc(struct knot_mm *mm, void **local_state, struct kr_request *req); void forward_choose_transport(struct kr_query *qry, struct kr_transport **transport); void forward_success(struct kr_query *qry, const struct kr_transport *transport); void forward_error(struct kr_query *qry, const struct kr_transport *transport, enum kr_selection_error sel_error); diff --git a/lib/selection_iter.h b/lib/selection_iter.h index 4208b0361..a373cb990 100644 --- a/lib/selection_iter.h +++ b/lib/selection_iter.h @@ -6,7 +6,7 @@ #include "lib/selection.h" -void iter_local_state_init(struct knot_mm *mm, void **local_state); +void iter_local_state_alloc(struct knot_mm *mm, void **local_state); void iter_choose_transport(struct kr_query *qry, struct kr_transport **transport); void iter_success(struct kr_query *qry, const struct kr_transport *transport); void iter_error(struct kr_query *qry, const struct kr_transport *transport, enum kr_selection_error sel_error);