[PATCH v2 3/9] uci: optimize update option in uci_set
Jan Venekamp
jan at venekamp.net
Sat Nov 19 17:08:22 PST 2022
Optimize for the case when there is no need to reallocate memory when
updating an option in uci_set.
Signed-off-by: Jan Venekamp <jan at venekamp.net>
---
list.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/list.c b/list.c
index a8f2a2c..5148dfd 100644
--- a/list.c
+++ b/list.c
@@ -725,17 +725,19 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section);
ptr->last = &ptr->s->e;
} else if (ptr->o && ptr->option) { /* update option */
- struct uci_option *old = ptr->o;
-
- if ((ptr->o->type == UCI_TYPE_STRING) &&
- !strcmp(ptr->o->v.string, ptr->value))
+ if (ptr->o->type == UCI_TYPE_STRING && !strcmp(ptr->o->v.string, ptr->value))
return 0;
- ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, &old->e.list);
- if (ptr->option == old->e.name)
- ptr->option = ptr->o->e.name;
- uci_free_option(old);
- ptr->last = &ptr->o->e;
+ if (ptr->o->type == UCI_TYPE_STRING && strlen(ptr->o->v.string) == strlen(ptr->value)) {
+ strcpy(ptr->o->v.string, ptr->value);
+ } else {
+ struct uci_option *old = ptr->o;
+ ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, &old->e.list);
+ if (ptr->option == old->e.name)
+ ptr->option = ptr->o->e.name;
+ uci_free_option(old);
+ ptr->last = &ptr->o->e;
+ }
} else if (ptr->s && ptr->section) { /* update section */
char *s = uci_strdup(ctx, ptr->value);
--
2.32.0 (Apple Git-132)
More information about the openwrt-devel
mailing list