Skip to content

get the correct pointer to user's meta in the smart-array #22

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

get the correct pointer to user's meta in the smart-array #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f217a83
get the correct pointer to user's meta in the smart-array
Mar 10, 2022
2021450
copy array elements to a smart_arr
Mar 10, 2022
a9f5420
args value can be absense, initializing an array can be separate from…
Mar 10, 2022
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
10 changes: 7 additions & 3 deletions include/csptr/smart_ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CSPTR_INLINE void sfree_stack(void *ptr) {
({ \
struct s_tmp { \
CSPTR_SENTINEL_DEC \
__typeof__(__typeof__(Type)[Length]) value; \
__typeof__(Type) *value; \
f_destructor dtor; \
struct { \
const void *ptr; \
Expand All @@ -81,8 +81,12 @@ CSPTR_INLINE void sfree_stack(void *ptr) {
__VA_ARGS__ \
}; \
void *var = smalloc(sizeof (Type), Length, Kind, ARGS_); \
if (var != NULL) \
memcpy(var, &args.value, sizeof (Type)); \
if (var != NULL) { \
if (args.value != NULL) \
memcpy(var, args.value, sizeof (Type) * Length); \
else \
memset(var, 0, sizeof(Type) * Length); \
} \
var; \
})

Expand Down
2 changes: 1 addition & 1 deletion src/mman.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CSPTR_INLINE static void dealloc_entry(s_meta *meta, void *ptr) {
if (meta->kind & ARRAY) {
s_meta_array *arr_meta = (void *) (meta + 1);
for (size_t i = 0; i < arr_meta->nmemb; ++i)
meta->dtor((char *) ptr + arr_meta->size * i, user_meta);
meta->dtor((char *) ptr + arr_meta->size * i, arr_meta + 1);
} else
meta->dtor(ptr, user_meta);
}
Expand Down