X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcontainer_of%2Fcontainer_of.h;h=ea8f1dd36cc191d6d3d3f690d342c0845d61d32e;hp=4490184c2529b97ced2b9e3611e0f3671bae19f7;hb=578da7e7b6265153fa0519035fc52a086a711ac0;hpb=2eff9a654f86ec238ddda60f928dccfcd0767645

diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
index 4490184c..ea8f1dd3 100644
--- a/ccan/container_of/container_of.h
+++ b/ccan/container_of/container_of.h
@@ -32,19 +32,17 @@
 #define container_of(member_ptr, containing_type, member)		\
 	 ((containing_type *)						\
 	  ((char *)(member_ptr)						\
-	   - container_off((member_ptr), containing_type, member)))
+	   - container_off(containing_type, member))			\
+	  + check_types_match(*(member_ptr), ((containing_type *)0)->member))
 
 /**
  * container_off - get offset to enclosing structure
- * @member_ptr: pointer to the structure member
  * @containing_type: the type this member is within
  * @member: the name of this member within the structure.
  *
  * Given a pointer to a member of a structure, this macro does
  * typechecking and figures out the offset to the enclosing type.
  *
- * Note that @member_ptr is not evaluated.
- *
  * Example:
  *	struct foo {
  *		int fielda, fieldb;
@@ -57,18 +55,17 @@
  *
  *	static struct info *foo_to_info(struct foo *foo)
  *	{
- *		size_t off = container_off(foo, struct info, my_foo);
+ *		size_t off = container_off(struct info, my_foo);
  *		return (void *)((char *)foo - off);
  *	}
  */
-#define container_off(member_ptr, containing_type, member)		\
-	(offsetof(containing_type, member)				\
-	 + check_types_match(*(member_ptr), ((containing_type *)0)->member))
+#define container_off(containing_type, member)	\
+	offsetof(containing_type, member)
 
 /**
  * container_of_var - get pointer to enclosing structure using a variable
  * @member_ptr: pointer to the structure member
- * @var: a pointer to a structure of same type as this member is within
+ * @container_var: a pointer of same type as this member's container
  * @member: the name of this member within the structure.
  *
  * Given a pointer to a member of a structure, this macro does pointer
@@ -82,12 +79,13 @@
  *	}
  */
 #if HAVE_TYPEOF
-#define container_of_var(member_ptr, var, member) \
-	container_of(member_ptr, typeof(*var), member)
+#define container_of_var(member_ptr, container_var, member) \
+	container_of(member_ptr, typeof(*container_var), member)
 #else
-#define container_of_var(member_ptr, var, member)		\
-	((void *)((char *)(member_ptr)				\
-		  - ((char *)&(var)->member - (char *)(var))))
+#define container_of_var(member_ptr, container_var, member)		\
+	((void *)((char *)(member_ptr)					\
+		  - ((char *)&(container_var)->member			\
+		     - (char *)(container_var))))
 #endif
 
 #endif /* CCAN_CONTAINER_OF_H */