mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-06 16:05:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Centralize freeing of opts object allocs

Browse Source
This commit is contained in:
Kovid Goyal
2023-10-10 06:08:28 +05:30
parent 455d0a6048
commit b78264183f
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kitty/options/to-c.h
View File

@@ -107,7 +107,6 @@ bell_path(PyObject *src, Options *opts) { STR_SETTER(bell_path); }
static void
bell_theme(PyObject *src, Options *opts) { STR_SETTER(bell_theme); }
static void
window_logo_path(PyObject *src, Options *opts) { STR_SETTER(default_window_logo); }
@@ -151,19 +150,19 @@ macos_colorspace(PyObject *csname) {
}
static inline void
free_url_prefixes(void) {
OPT(url_prefixes).num = 0;
OPT(url_prefixes).max_prefix_len = 0;
if (OPT(url_prefixes).values) {
free(OPT(url_prefixes.values));
OPT(url_prefixes).values = NULL;
free_url_prefixes(Options *opts) {
opts->url_prefixes.num = 0;
opts->url_prefixes.max_prefix_len = 0;
if (opts->url_prefixes.values) {
free(opts->url_prefixes.values);
opts->url_prefixes.values = NULL;
}
}
static void
url_prefixes(PyObject *up, Options *opts) {
if (!PyTuple_Check(up)) { PyErr_SetString(PyExc_TypeError, "url_prefixes must be a tuple"); return; }
free_url_prefixes();
free_url_prefixes(opts);
opts->url_prefixes.values = calloc(PyTuple_GET_SIZE(up), sizeof(UrlPrefix));
if (!opts->url_prefixes.values) { PyErr_NoMemory(); return; }
opts->url_prefixes.num = PyTuple_GET_SIZE(up);
@@ -192,6 +191,7 @@ free_menu_map(Options *opts) {
}
free(opts->global_menu.entries); opts->global_menu.entries = NULL;
}
opts->global_menu.count = 0;
}
static void
@@ -304,3 +304,13 @@ resize_debounce_time(PyObject *src, Options *opts) {
opts->resize_debounce_time.on_end = s_double_to_monotonic_t(PyFloat_AsDouble(PyTuple_GET_ITEM(src, 0)));
opts->resize_debounce_time.on_pause = s_double_to_monotonic_t(PyFloat_AsDouble(PyTuple_GET_ITEM(src, 1)));
}
static void
free_allocs_in_options(Options *opts) {
free_menu_map(opts);
free_url_prefixes(opts);
#define F(x) free(opts->x); opts->x = NULL;
F(select_by_word_characters); F(url_excluded_characters); F(select_by_word_characters_forward);
F(background_image); F(bell_path); F(bell_theme); F(default_window_logo);
#undef F
}

5
kitty/state.c
View File

@@ -1406,9 +1406,8 @@ finalize(void) {
free_bgimage(&global_state.bgimage, false);
free_window_logo_table(&global_state.all_window_logos);
global_state.bgimage = NULL;
free_url_prefixes();
free(OPT(select_by_word_characters)); OPT(select_by_word_characters) = NULL;
free(OPT(url_excluded_characters)); OPT(url_excluded_characters) = NULL;
free_allocs_in_options(&global_state.opts);
}
bool