aboutsummaryrefslogtreecommitdiff
path: root/src/set
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-18 00:44:39 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-18 00:44:39 +0200
commit7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch)
tree5f1b18463f641f24fad519e0aefb60b97d707b52 /src/set
parent28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff)
downloadgnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz
gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/set')
-rw-r--r--src/set/gnunet-service-set_intersection.c2
-rw-r--r--src/set/gnunet-service-set_union_strata_estimator.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 993cead11..9313483bb 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -868,7 +868,7 @@ process_bf (struct Operation *op)
868 GNUNET_CONTAINER_multihashmap_size (op->state->my_elements)); 868 GNUNET_CONTAINER_multihashmap_size (op->state->my_elements));
869 op->state->full_result_iter 869 op->state->full_result_iter
870 = GNUNET_CONTAINER_multihashmap_iterator_create ( 870 = GNUNET_CONTAINER_multihashmap_iterator_create (
871 op->state->my_elements); 871 op->state->my_elements);
872 send_remaining_elements (op); 872 send_remaining_elements (op);
873 return; 873 return;
874 } 874 }
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
index 1101a56a6..97b4a1f98 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -149,7 +149,7 @@ strata_estimator_insert (struct StrataEstimator *se,
149 149
150 v = key.key_val; 150 v = key.key_val;
151 /* count trailing '1'-bits of v */ 151 /* count trailing '1'-bits of v */
152 for (i = 0; v &1; v >>= 1, i++) 152 for (i = 0; v & 1; v >>= 1, i++)
153 /* empty */; 153 /* empty */;
154 ibf_insert (se->strata[i], key); 154 ibf_insert (se->strata[i], key);
155} 155}
@@ -170,7 +170,7 @@ strata_estimator_remove (struct StrataEstimator *se,
170 170
171 v = key.key_val; 171 v = key.key_val;
172 /* count trailing '1'-bits of v */ 172 /* count trailing '1'-bits of v */
173 for (i = 0; v &1; v >>= 1, i++) 173 for (i = 0; v & 1; v >>= 1, i++)
174 /* empty */; 174 /* empty */;
175 ibf_remove (se->strata[i], key); 175 ibf_remove (se->strata[i], key);
176} 176}