Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/guards/cleanup.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test_clean_keep(void)
{
BFDEV_CLEAN(malloc) void *block;
block = malloc(8);
bfdev_return(block);
return bfdev_taken(block);
}

int
Expand Down
8 changes: 3 additions & 5 deletions include/bfdev/guards.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ __bfdev_class_##name##_destructor(type *p) \
__bfdev_cleanup(__bfdev_class_##name##_destructor) = \
__bfdev_class_##name##_constructor

#define bfdev_lasting(object) ({ \
#define bfdev_taken(object) ({ \
__auto_type __ptr = (object); \
(object) = BFDEV_NULL; __ptr; \
(object) = BFDEV_NULL; \
__ptr; \
})

#define bfdev_return(object) \
return bfdev_lasting(object)

BFDEV_END_DECLS

#endif /* _BFDEV_GUARDS_H_ */
Loading