meta2: clarify variable name

open-io · Mar 5, 2018 · 795a51c · 795a51c
1 parent 4398693
commit 795a51c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/meta2v2/meta2_filters_action_container.c b/meta2v2/meta2_filters_action_container.c
@@ -147,7 +147,7 @@ meta2_filter_action_purge_container(struct gridd_filter_ctx_s *ctx,
 	struct meta2_backend_s *m2b = meta2_filter_ctx_get_backend(ctx);
 	struct oio_url_s *url = meta2_filter_ctx_get_url(ctx);
 	gint64 *pmaxvers = NULL;
-	GSList *beans_list = NULL;
+	GSList *beans_list_list = NULL;
 
 	const char *maxvers_str = meta2_filter_ctx_get_param(ctx,
 			NAME_MSGKEY_MAXVERS);
@@ -157,13 +157,13 @@ meta2_filter_action_purge_container(struct gridd_filter_ctx_s *ctx,
 	}
 
 	GError *err = meta2_backend_purge_container(m2b, url, pmaxvers,
-			_bean_list_cb, &beans_list);
+			_bean_list_cb, &beans_list_list);
 
-	for (GSList *l=beans_list; l; l=l->next) {
+	for (GSList *l = beans_list_list; l; l = l->next) {
 		_m2b_notify_beans(m2b, url, l->data, "content.deleted", TRUE);
 		_bean_cleanl2(l->data);
 	}
-	g_slist_free(beans_list);
+	g_slist_free(beans_list_list);
 
 	if (!err)
 		return FILTER_OK;

diff --git a/meta2v2/meta2_filters_action_content.c b/meta2v2/meta2_filters_action_content.c
@@ -616,7 +616,7 @@ meta2_filter_action_purge_content(struct gridd_filter_ctx_s *ctx,
 	struct meta2_backend_s *m2b = meta2_filter_ctx_get_backend(ctx);
 	struct oio_url_s *url = meta2_filter_ctx_get_url(ctx);
 	gint64 *pmaxvers = NULL;
-	GSList *beans_list = NULL;
+	GSList *beans_list_list = NULL;
 
 	const char *maxvers_str = meta2_filter_ctx_get_param(ctx,
 			NAME_MSGKEY_MAXVERS);
@@ -625,14 +625,15 @@ meta2_filter_action_purge_content(struct gridd_filter_ctx_s *ctx,
 		pmaxvers = &maxvers;
 	}
 
+	// Here we are abusing _bean_list_cb with a list of lists of beans
 	GError *err = meta2_backend_purge_alias(m2b, url, pmaxvers,
-			_bean_list_cb, &beans_list);
+			_bean_list_cb, &beans_list_list);
 
-	for (GSList *l=beans_list; l; l=l->next) {
+	for (GSList *l = beans_list_list; l; l = l->next) {
 		_m2b_notify_beans(m2b, url, l->data, "content.deleted", TRUE);
 		_bean_cleanl2(l->data);
 	}
-	g_slist_free(beans_list);
+	g_slist_free(beans_list_list);
 
 	if (!err)
 		return FILTER_OK;

diff --git a/meta2v2/meta2_utils.h b/meta2v2/meta2_utils.h
@@ -202,8 +202,9 @@ GError* m2db_get_storage_policy(struct sqlx_sqlite3_s *sq3, struct oio_url_s *ur
  * @param retention_delay Delay in seconds before actually purging
  *     a deleted alias (use -1 to keep all deleted aliases)
  * @param flags: M2V2_DRYRUN_MODE, ...
- * @param cb: callback for chunks that have been removed from
- *     the database, and that should be removed from disk
+ * @param cb: callback for lists of beans (one list per alias)
+ *     that have been removed from the database,
+ *     and that should be notified
  * @param u0: argument for the callback
  * @return
  */