KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use cleanup in a few more places to simplify the code

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-19 18:53:30 +05:30
parent a097f5df23
commit 2a96d2621c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/data-types.c
View File

@ -41,18 +41,17 @@ static PyObject*
process_group_map() {
int num_of_processes = proc_listallpids(NULL, 0);
size_t bufsize = sizeof(pid_t) * (num_of_processes + 1024);
pid_t *buf = malloc(bufsize);
FREE_AFTER_FUNCTION pid_t *buf = malloc(bufsize);
if (!buf) return PyErr_NoMemory();
num_of_processes = proc_listallpids(buf, (int)bufsize);
PyObject *ans = PyTuple_New(num_of_processes);
if (ans == NULL) { free(buf); return PyErr_NoMemory(); }
if (ans == NULL) { return PyErr_NoMemory(); }
for (int i = 0; i < num_of_processes; i++) {
long pid = buf[i], pgid = getpgid(buf[i]);
PyObject *t = Py_BuildValue("ll", pid, pgid);
if (t == NULL) { free(buf); Py_DECREF(ans); return NULL; }
if (t == NULL) { Py_DECREF(ans); return NULL; }
PyTuple_SET_ITEM(ans, i, t);
}
free(buf);
return ans;
}
#endif

2
kitty/data-types.h
View File

@ -37,6 +37,8 @@
#define zero_at_ptr_count(p, count) memset((p), 0, (count) * sizeof((p)[0]))
void log_error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
#define fatal(...) { log_error(__VA_ARGS__); exit(EXIT_FAILURE); }
static inline void cleanup_free(void *p) { free(*(void**)p); }
#define FREE_AFTER_FUNCTION __attribute__((cleanup(cleanup_free)))
typedef unsigned long long id_type;
typedef uint32_t char_type;

13
kitty/disk-cache.c
View File

@ -91,7 +91,7 @@ open_cache_file(const char *cache_path) {
}
#else
size_t sz = strlen(cache_path) + 16;
char *buf = calloc(1, sz);
FREE_AFTER_FUNCTION char *buf = calloc(1, sz);
if (!buf) { errno = ENOMEM; return -1; }
snprintf(buf, sz - 1, "%s/disk-cache-XXXXXXXXXXXX", cache_path);
while (fd < 0) {
@ -99,7 +99,6 @@ open_cache_file(const char *cache_path) {
if (fd > -1 || errno != EINTR) break;
}
if (fd > -1) unlink(buf);
free(buf);
#endif
return fd;
}
@ -171,8 +170,8 @@ typedef struct {
static void
defrag(DiskCache *self) {
int new_cache_file = -1;
DefragEntry *defrag_entries = NULL;
uint8_t *buf = NULL;
FREE_AFTER_FUNCTION DefragEntry *defrag_entries = NULL;
FREE_AFTER_FUNCTION uint8_t *buf = NULL;
const size_t bufsz = 1024 * 1024;
bool lock_released = false, ok = false;
@ -235,8 +234,6 @@ cleanup:
if (s) s->pos_in_cache_file = e->new_offset;
}
}
if (defrag_entries) free(defrag_entries);
if (buf) free(buf);
if (new_cache_file > -1) safe_close(new_cache_file, __FILE__, __LINE__);
}
@ -484,7 +481,7 @@ add_to_disk_cache(PyObject *self_, const void *key, size_t key_sz, const void *d
if (!ensure_state(self)) return false;
if (key_sz > MAX_KEY_SIZE) { PyErr_SetString(PyExc_KeyError, "cache key is too long"); return false; }
CacheEntry *s = NULL;
uint8_t *copied_data = malloc(data_sz);
FREE_AFTER_FUNCTION uint8_t *copied_data = malloc(data_sz);
if (!copied_data) { PyErr_NoMemory(); return false; }
memcpy(copied_data, data, data_sz);
@ -503,8 +500,6 @@ add_to_disk_cache(PyObject *self_, const void *key, size_t key_sz, const void *d
self->total_size += s->data_sz;
end:
mutex(unlock);
if (copied_data) free(copied_data);
if (PyErr_Occurred()) return false;
wakeup_write_loop(self);
return true;