Upstream status: https://github.com/redis/hiredis-py/pull/159 From c2a20695aae53de7b5160e29675344df0b805fa6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Mar 2023 15:18:08 -0400 Subject: [PATCH] pack: Replace sdsalloc.h with alloc.h Fixes #158. * src/pack.c: Replace sdsalloc.h with alloc.h. (pack_command): Replace s_malloc with hi_malloc. --- src/pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pack.c b/src/pack.c index 443e9d3..23e4004 100644 --- a/src/pack.c +++ b/src/pack.c @@ -16,7 +16,7 @@ extern sds sdscpylen(sds s, const char *t, size_t len); extern sds sdsnewlen(const void *init, size_t initlen); #endif -#include +#include PyObject * pack_command(PyObject *cmd) @@ -32,7 +32,7 @@ pack_command(PyObject *cmd) } Py_ssize_t tokens_number = PyTuple_Size(cmd); - sds *tokens = s_malloc(sizeof(sds) * tokens_number); + sds *tokens = hi_malloc(sizeof(sds) * tokens_number); if (tokens == NULL) { return PyErr_NoMemory(); @@ -118,4 +118,4 @@ cleanup: sdsfreesplitres(tokens, tokens_number); hi_free(lengths); return result; -} \ No newline at end of file +} base-commit: 8adb1b3cb38b82cdc73fa2d72879712da1f74e70 -- 2.39.1 /tests/modules.scm?id=b50d14784e1e15f0403e78a3ed65ece27e87c119'>commitdiff
AgeCommit message (Expand)Author
2021-12-23Remove VM generation dead-code....This code duplicates the (gnu system image) and (gnu build image) code. Using VM for image generation is not needed, not portable and really slow. Remove all the VM image generation code to make sure that only the image API is used. * gnu/build/vm.scm: Remove it. Move the qemu-command procedure to ... * gnu/build/marionette.scm: ... here. * gnu/local.mk (GNU_SYSTEM_MODULES): Adapt it. * tests/modules.scm: Ditto. * gnu/tests/install.scm: Ditto. * gnu/system/vm.scm: Adapt it and remove expression->derivation-in-linux-vm, qemu-img, system-qemu-image/shared-store and system-docker-image procedures. * doc/guix.texi (G-Expressions): Adapt it. Mathieu Othacehe