Skip to content

Add variadic args to rd_calloc_struct #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eugpermar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add variadic args to rd_calloc_struct #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rdmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ size_t rd_memctx_freeall (rd_memctx_t *rmc) {



void *rd_calloc_struct0 (rd_memctx_t *rmc, size_t base_size, ...) {
va_list ap;
void *vrd_calloc_struct0 (rd_memctx_t *rmc, size_t base_size, va_list t_ap) {
size_t tot_size = base_size;
int pass;
char *tail = NULL;
void *ptr = NULL;
va_list ap;

/*
* 1) Pass 1: calculate total memory size.
Expand All @@ -225,7 +225,7 @@ void *rd_calloc_struct0 (rd_memctx_t *rmc, size_t base_size, ...) {
int elem_size;
void *elem_src, **elem_dst;

va_start(ap, base_size);
va_copy(ap, t_ap);
while ((elem_size = va_arg(ap, int)) != RD_MEM_END_TOKEN) {
elem_src = va_arg(ap, void *);
elem_dst = va_arg(ap, void **);
Expand Down
15 changes: 14 additions & 1 deletion rdmem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "rdqueue.h"
#include "rdthread.h"

#include <stdarg.h>

/**
* Single allocation, when RD_MEMCTX_F_TRACK is used.
*/
Expand Down Expand Up @@ -194,7 +196,18 @@ size_t rd_memctx_freeall (rd_memctx_t *rmc);
*(pptr) = NULL; \
*(pptr) = rd_calloc_struct0(rmc, base_size, ARGS); \
} while (0)
void *rd_calloc_struct0 (rd_memctx_t *rmc, size_t base_size, ...);
void *vrd_calloc_struct0 (rd_memctx_t *rmc, size_t base_size, va_list ap);
static void *rd_calloc_struct0(rd_memctx_t *rmc, size_t base_size, ...) RD_UNUSED;
static void *rd_calloc_struct0(rd_memctx_t *rmc, size_t base_size, ...) {
void *ret = NULL;
va_list ap;

va_start(ap, base_size);
ret = vrd_calloc_struct0(rmc, base_size, ap);
va_end(ap);

return ret;
}


static inline char *rd_memctx_strdup(rd_memctx_t *memctx,const char *src) RD_UNUSED;
Expand Down