From 3b3d63e234978e76a901b7968955a3f2e7e855d4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 16 Mar 2018 00:21:58 +0100 Subject: [PATCH] list: only record ordering deltas if element position changed Signed-off-by: Jo-Philipp Wich --- list.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/list.c b/list.c index 0347138..abb202f 100644 --- a/list.c +++ b/list.c @@ -12,8 +12,9 @@ * GNU Lesser General Public License for more details. */ -static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos) +static bool uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos) { + struct uci_list *old_head = ptr->prev; struct uci_list *new_head = head; struct uci_element *p = NULL; @@ -25,6 +26,8 @@ static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int po } uci_list_add(new_head->next, ptr); + + return (old_head != new_head); } static inline void uci_list_fixup(struct uci_list *ptr) @@ -514,12 +517,13 @@ int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos) { struct uci_package *p = s->package; bool internal = ctx && ctx->internal; + bool changed = false; char order[32]; UCI_HANDLE_ERR(ctx); - uci_list_set_pos(&s->package->sections, &s->e.list, pos); - if (!internal && p->has_delta) { + changed = uci_list_set_pos(&s->package->sections, &s->e.list, pos); + if (!internal && p->has_delta && changed) { sprintf(order, "%d", pos); uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order); } -- 2.25.1