From 693fc0f0c7329c6b386258b669803a5a5e869bd1 Mon Sep 17 00:00:00 2001 From: pagedown Date: Wed, 23 Feb 2022 21:28:29 +0800 Subject: [PATCH 1/3] CI: Disable codeql auto install python dependencies --- .github/workflows/codeql-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 01fb2557c..6d6c56c07 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,6 +27,7 @@ jobs: uses: github/codeql-action/init@v1 with: languages: python, c + setup-python-dependencies: false - name: Build kitty run: python3 .github/workflows/ci.py build From 43f435c3349f61ffb5d6f766fb001cd06a988fac Mon Sep 17 00:00:00 2001 From: pagedown Date: Wed, 23 Feb 2022 21:30:05 +0800 Subject: [PATCH 2/3] Avoid shadow the global variable name --- kitty/fonts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kitty/fonts.c b/kitty/fonts.c index 940ee1e86..cdf913e59 100644 --- a/kitty/fonts.c +++ b/kitty/fonts.c @@ -1338,11 +1338,11 @@ typedef struct { DescriptorIndices descriptor_indices = {0}; static bool -set_symbol_maps(SymbolMap **symbol_maps, size_t *num_symbol_maps, const PyObject *sm) { - *num_symbol_maps = PyTuple_GET_SIZE(sm); - *symbol_maps = calloc(*num_symbol_maps, sizeof(SymbolMap)); +set_symbol_maps(SymbolMap **symbol_maps, size_t *num, const PyObject *sm) { + *num = PyTuple_GET_SIZE(sm); + *symbol_maps = calloc(*num, sizeof(SymbolMap)); if (*symbol_maps == NULL) { PyErr_NoMemory(); return false; } - for (size_t s = 0; s < *num_symbol_maps; s++) { + for (size_t s = 0; s < *num; s++) { unsigned int left, right, font_idx; SymbolMap *x = *symbol_maps + s; if (!PyArg_ParseTuple(PyTuple_GET_ITEM(sm, s), "III", &left, &right, &font_idx)) return NULL; From a9a79123723fee0d12e003659f32ac76a973b86f Mon Sep 17 00:00:00 2001 From: pagedown Date: Wed, 23 Feb 2022 21:37:41 +0800 Subject: [PATCH 3/3] ... --- kitty/fonts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kitty/fonts.c b/kitty/fonts.c index cdf913e59..942c9a85a 100644 --- a/kitty/fonts.c +++ b/kitty/fonts.c @@ -1338,13 +1338,13 @@ typedef struct { DescriptorIndices descriptor_indices = {0}; static bool -set_symbol_maps(SymbolMap **symbol_maps, size_t *num, const PyObject *sm) { +set_symbol_maps(SymbolMap **maps, size_t *num, const PyObject *sm) { *num = PyTuple_GET_SIZE(sm); - *symbol_maps = calloc(*num, sizeof(SymbolMap)); - if (*symbol_maps == NULL) { PyErr_NoMemory(); return false; } + *maps = calloc(*num, sizeof(SymbolMap)); + if (*maps == NULL) { PyErr_NoMemory(); return false; } for (size_t s = 0; s < *num; s++) { unsigned int left, right, font_idx; - SymbolMap *x = *symbol_maps + s; + SymbolMap *x = *maps + s; if (!PyArg_ParseTuple(PyTuple_GET_ITEM(sm, s), "III", &left, &right, &font_idx)) return NULL; x->left = left; x->right = right; x->font_idx = font_idx; }