aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2024-03-16 20:28:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-03-17 11:31:02 +0000
commite8b04e0e2c9e8a4f825193b907d04c3b3165a842 (patch)
treee09c19881361236101249e846d7ac8618ca4baab /config.c
parentmain/config: replace some uses of xasprintf() with xstrjoin() (diff)
xmalloc: add xmemdup() and use to replace some uses of xmalloc+memcpy
Diffstat (limited to 'config.c')
-rw-r--r--config.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/config.c b/config.c
index ff92cb46..d2b75180 100644
--- a/config.c
+++ b/config.c
@@ -2902,8 +2902,7 @@ add_default_key_bindings(struct config *conf)
};
conf->bindings.key.count = ALEN(bindings);
- conf->bindings.key.arr = xmalloc(sizeof(bindings));
- memcpy(conf->bindings.key.arr, bindings, sizeof(bindings));
+ conf->bindings.key.arr = xmemdup(bindings, sizeof(bindings));
}
@@ -2954,8 +2953,7 @@ add_default_search_bindings(struct config *conf)
};
conf->bindings.search.count = ALEN(bindings);
- conf->bindings.search.arr = xmalloc(sizeof(bindings));
- memcpy(conf->bindings.search.arr, bindings, sizeof(bindings));
+ conf->bindings.search.arr = xmemdup(bindings, sizeof(bindings));
}
static void
@@ -2970,8 +2968,7 @@ add_default_url_bindings(struct config *conf)
};
conf->bindings.url.count = ALEN(bindings);
- conf->bindings.url.arr = xmalloc(sizeof(bindings));
- memcpy(conf->bindings.url.arr, bindings, sizeof(bindings));
+ conf->bindings.url.arr = xmemdup(bindings, sizeof(bindings));
}
static void
@@ -2994,8 +2991,7 @@ add_default_mouse_bindings(struct config *conf)
};
conf->bindings.mouse.count = ALEN(bindings);
- conf->bindings.mouse.arr = xmalloc(sizeof(bindings));
- memcpy(conf->bindings.mouse.arr, bindings, sizeof(bindings));
+ conf->bindings.mouse.arr = xmemdup(bindings, sizeof(bindings));
}
static void NOINLINE
@@ -3388,8 +3384,7 @@ key_binding_list_clone(struct config_key_binding_list *dst,
if (old->aux.master_copy) {
const size_t len = old->aux.text.len;
new->aux.text.len = len;
- new->aux.text.data = xmalloc(len);
- memcpy(new->aux.text.data, old->aux.text.data, len);
+ new->aux.text.data = xmemdup(old->aux.text.data, len);
last_master_text_len = len;
last_master_text_data = new->aux.text.data;