Merge pull request #702 from sanpeqf/refactor-guards

refactor guards: remove return function

Author: pixclk

examples/guards/cleanup.c

@@ -27,7 +27,7 @@ test_clean_keep(void)
 {
     BFDEV_CLEAN(malloc) void *block;
     block = malloc(8);
-    bfdev_return(block);
+    return bfdev_taken(block);
 }
 
 int

include/bfdev/guards.h

@@ -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_ */