[Bf-blender-cvs] [87a385b] libquery-recursive: Cleanup (remove some useless diff compared to master).

[Bastien Montagne]

Commit: 87a385b838be2192c595498a450b749a0ab00b9d
Author: Bastien Montagne
Date:   Fri Feb 19 10:36:20 2016 +0100
Branches: libquery-recursive
https://developer.blender.org/rB87a385b838be2192c595498a450b749a0ab00b9d

Cleanup (remove some useless diff compared to master).

===================================================================

M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/library_query.c
M	source/blender/editors/object/object_relations.c
M	source/blender/python/intern/bpy_rna_id_collection.c
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index dfda527..c403319 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1066,7 +1066,7 @@ void *BKE_libblock_copy(ID *id)
 	return BKE_libblock_copy_ex(G.main, id);
 }
 
-static int id_relink_looper(void *UNUSED(user_data), ID *UNUSED(id_self), ID **id_pointer, const int cd_flag)
+static int id_relink_looper(void *UNUSED(user_data), ID *UNUSED(self_id), ID **id_pointer, const int cd_flag)
 {
 	ID *id = *id_pointer;
 	if (id) {
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 2a9f449..eeb0790 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -83,10 +83,10 @@
 #define FOREACH_CALLBACK_INVOKE_ID_PP(_data, id_pp, cb_flag) \
 	if (!((_data)->status & IDWALK_STOP)) { \
 		const int _flag = (_data)->flag; \
-		ID *old_id = *id_pp; \
-		const int callback_return = (_data)->callback((_data)->user_data, (_data)->id_self, id_pp, cb_flag); \
+		ID *old_id = *(id_pp); \
+		const int callback_return = (_data)->callback((_data)->user_data, (_data)->self_id, id_pp, cb_flag); \
 		if (_flag & IDWALK_READONLY) { \
-			BLI_assert(*id_pp == old_id); \
+			BLI_assert(*(id_pp) == old_id); \
 		} \
 		if (_flag & IDWALK_RECURSE) { \
 			if (!BLI_gset_haskey((_data)->ids_handled, old_id)) { \
@@ -105,16 +105,16 @@
 		goto FOREACH_FINALIZE; \
 	} ((void)0)
 
-#define FOREACH_CALLBACK_INVOKE_ID(data, id, cb_flag) \
+#define FOREACH_CALLBACK_INVOKE_ID(_data, id, cb_flag) \
 	{ \
 		CHECK_TYPE_ANY(id, ID *, void *); \
-		FOREACH_CALLBACK_INVOKE_ID_PP(data, (ID **)&(id), cb_flag); \
+		FOREACH_CALLBACK_INVOKE_ID_PP(_data, (ID **)&(id), cb_flag); \
 	} ((void)0)
 
-#define FOREACH_CALLBACK_INVOKE(data, id_super, cb_flag) \
+#define FOREACH_CALLBACK_INVOKE(_data, id_super, cb_flag) \
 	{ \
 		CHECK_TYPE(&((id_super)->id), ID *); \
-		FOREACH_CALLBACK_INVOKE_ID_PP(data, (ID **)&id_super, cb_flag); \
+		FOREACH_CALLBACK_INVOKE_ID_PP(_data, (ID **)&(id_super), cb_flag); \
 	} ((void)0)
 
 /* status */
@@ -123,11 +123,10 @@ enum {
 };
 
 typedef struct LibraryForeachIDData {
-	ID *id_self;
+	ID *self_id;
+	int flag;
 	LibraryIDLinkCallback callback;
 	void *user_data;
-
-	int flag;
 	int status;
 
 	/* To handle recursion. */
@@ -267,7 +266,7 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 	FOREACH_CALLBACK_INVOKE(&data, check_id_super, cb_flag)
 
 	do {
-		data.id_self = id;
+		data.self_id = id;
 
 		switch (GS(id->name)) {
 			case ID_SCE:
@@ -744,7 +743,7 @@ typedef struct IDUsersIter {
 	int count;  /* Set by callback. */
 } IDUsersIter;
 
-static int foreach_libblock_id_users_callback(void *user_data, ID *UNUSED(id_self), ID **id_p, int UNUSED(cb_flag))
+static int foreach_libblock_id_users_callback(void *user_data, ID *UNUSED(self_id), ID **id_p, int UNUSED(cb_flag))
 {
 	IDUsersIter *iter = user_data;
 
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index d73e569..efdc96f 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2124,7 +2124,7 @@ enum {
 };
 
 static int tag_localizable_looper(
-        void *UNUSED(user_data), ID *UNUSED(id_self), ID **id_pointer, const int UNUSED(cd_flag))
+        void *UNUSED(user_data), ID *UNUSED(self_id), ID **id_pointer, const int UNUSED(cd_flag))
 {
 	if (*id_pointer) {
 		(*id_pointer)->tag &= ~LIB_TAG_DOIT;
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c
index 964f3c3..104e3e4 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.c
+++ b/source/blender/python/intern/bpy_rna_id_collection.c
@@ -81,7 +81,7 @@ static bool id_check_type(const ID *id, const BLI_bitmap *types_bitmap)
 }
 
 static int foreach_libblock_id_user_map_callback(
-        void *user_data, ID *UNUSED(id_self), ID **id_p, int UNUSED(cb_flag))
+        void *user_data, ID *UNUSED(self_id), ID **id_p, int UNUSED(cb_flag))
 {
 	IDUserMapData *data = user_data;
 
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ae307e5..2c2bb42 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4868,7 +4868,7 @@ static void previews_id_ensure(bContext *C, Scene *scene, ID *id)
 	}
 }
 
-static int previews_id_ensure_callback(void *userdata, ID *UNUSED(id_self), ID **idptr, int UNUSED(cd_flag))
+static int previews_id_ensure_callback(void *userdata, ID *UNUSED(self_id), ID **idptr, int UNUSED(cd_flag))
 {
 	PreviewsIDEnsureData *data = userdata;
 	ID *id = *idptr;
@@ -4876,7 +4876,7 @@ static int previews_id_ensure_callback(void *userdata, ID *UNUSED(id_self), ID *
 	if (id && (id->tag & LIB_TAG_DOIT)) {
 		BLI_assert(ELEM(GS(id->name), ID_MA, ID_TE, ID_IM, ID_WO, ID_LA));
 		previews_id_ensure(data->C, data->scene, id);
-		id->tag &= ~LIB_TAG_DOIT;  /* Tag the ID as done in any case. */
+		id->tag &= ~LIB_TAG_DOIT;
 	}
 
 	return IDWALK_RET_NOP;