freshlybakedca.ke / git
Git fork
fork atom

bloom: rename function operates on bloom_key

git code style requires that functions operating on a struct S
should be named in the form S_verb. However, the functions operating
on struct bloom_key do not follow this convention. Therefore,
fill_bloom_key() and clear_bloom_key() are renamed to bloom_key_fill()
and bloom_key_clear(), respectively.

Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Lidong Yan and committed by
Junio C Hamano b187353e 4ca70179

+16 -19
unified split
+1 -1
blame.c
··· 1310 1310 } 1311 1311 1312 1312 bd->keys[bd->nr] = xmalloc(sizeof(struct bloom_key)); 1313 - fill_bloom_key(path, strlen(path), bd->keys[bd->nr], bd->settings); 1313 + bloom_key_fill(bd->keys[bd->nr], path, strlen(path), bd->settings); 1314 1314 bd->nr++; 1315 1315 } 1316 1316
+4 -6
bloom.c
··· 221 221 return seed; 222 222 } 223 223 224 - void fill_bloom_key(const char *data, 225 - size_t len, 226 - struct bloom_key *key, 224 + void bloom_key_fill(struct bloom_key *key, const char *data, size_t len, 227 225 const struct bloom_filter_settings *settings) 228 226 { 229 227 int i; ··· 243 241 key->hashes[i] = hash0 + i * hash1; 244 242 } 245 243 246 - void clear_bloom_key(struct bloom_key *key) 244 + void bloom_key_clear(struct bloom_key *key) 247 245 { 248 246 FREE_AND_NULL(key->hashes); 249 247 } ··· 500 498 501 499 hashmap_for_each_entry(&pathmap, &iter, e, entry) { 502 500 struct bloom_key key; 503 - fill_bloom_key(e->path, strlen(e->path), &key, settings); 501 + bloom_key_fill(&key, e->path, strlen(e->path), settings); 504 502 add_key_to_filter(&key, filter, settings); 505 - clear_bloom_key(&key); 503 + bloom_key_clear(&key); 506 504 } 507 505 508 506 cleanup:
+2 -4
bloom.h
··· 78 78 struct bloom_filter *filter, 79 79 uint32_t graph_pos); 80 80 81 - void fill_bloom_key(const char *data, 82 - size_t len, 83 - struct bloom_key *key, 81 + void bloom_key_fill(struct bloom_key *key, const char *data, size_t len, 84 82 const struct bloom_filter_settings *settings); 85 - void clear_bloom_key(struct bloom_key *key); 83 + void bloom_key_clear(struct bloom_key *key); 86 84 87 85 void add_key_to_filter(const struct bloom_key *key, 88 86 struct bloom_filter *filter,
+3 -2
line-log.c
··· 1172 1172 return 0; 1173 1173 1174 1174 while (!result && range) { 1175 - fill_bloom_key(range->path, strlen(range->path), &key, rev->bloom_filter_settings); 1175 + bloom_key_fill(&key, range->path, strlen(range->path), 1176 + rev->bloom_filter_settings); 1176 1177 1177 1178 if (bloom_filter_contains(filter, &key, rev->bloom_filter_settings)) 1178 1179 result = 1; 1179 1180 1180 - clear_bloom_key(&key); 1181 + bloom_key_clear(&key); 1181 1182 range = range->next; 1182 1183 } 1183 1184
+4 -4
revision.c
··· 739 739 revs->bloom_keys_nr = path_component_nr; 740 740 ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr); 741 741 742 - fill_bloom_key(path, len, &revs->bloom_keys[0], 742 + bloom_key_fill(&revs->bloom_keys[0], path, len, 743 743 revs->bloom_filter_settings); 744 744 path_component_nr = 1; 745 745 746 746 p = path + len - 1; 747 747 while (p > path) { 748 748 if (*p == '/') 749 - fill_bloom_key(path, p - path, 750 - &revs->bloom_keys[path_component_nr++], 749 + bloom_key_fill(&revs->bloom_keys[path_component_nr++], 750 + path, p - path, 751 751 revs->bloom_filter_settings); 752 752 p--; 753 753 } ··· 3230 3230 oidset_clear(&revs->missing_commits); 3231 3231 3232 3232 for (int i = 0; i < revs->bloom_keys_nr; i++) 3233 - clear_bloom_key(&revs->bloom_keys[i]); 3233 + bloom_key_clear(&revs->bloom_keys[i]); 3234 3234 FREE_AND_NULL(revs->bloom_keys); 3235 3235 revs->bloom_keys_nr = 0; 3236 3236 }
+2 -2
t/helper/test-bloom.c
··· 12 12 static void add_string_to_filter(const char *data, struct bloom_filter *filter) { 13 13 struct bloom_key key; 14 14 15 - fill_bloom_key(data, strlen(data), &key, &settings); 15 + bloom_key_fill(&key, data, strlen(data), &settings); 16 16 printf("Hashes:"); 17 17 for (size_t i = 0; i < settings.num_hashes; i++) 18 18 printf("0x%08x|", key.hashes[i]); 19 19 printf("\n"); 20 20 add_key_to_filter(&key, filter, &settings); 21 - clear_bloom_key(&key); 21 + bloom_key_clear(&key); 22 22 } 23 23 24 24 static void print_bloom_filter(struct bloom_filter *filter) {