strbuf: simplify comment-handling in add_lines() helper
[git.git] / oidset.c
blobd1e5376316ecd5f9dcf549e1067697283bdc712c
1 #include "git-compat-util.h"
2 #include "oidset.h"
3 #include "hex.h"
4 #include "strbuf.h"
6 void oidset_init(struct oidset *set, size_t initial_size)
8 memset(&set->set, 0, sizeof(set->set));
9 if (initial_size)
10 kh_resize_oid_set(&set->set, initial_size);
13 int oidset_contains(const struct oidset *set, const struct object_id *oid)
15 khiter_t pos = kh_get_oid_set(&set->set, *oid);
16 return pos != kh_end(&set->set);
19 int oidset_insert(struct oidset *set, const struct object_id *oid)
21 int added;
22 kh_put_oid_set(&set->set, *oid, &added);
23 return !added;
26 int oidset_remove(struct oidset *set, const struct object_id *oid)
28 khiter_t pos = kh_get_oid_set(&set->set, *oid);
29 if (pos == kh_end(&set->set))
30 return 0;
31 kh_del_oid_set(&set->set, pos);
32 return 1;
35 void oidset_clear(struct oidset *set)
37 kh_release_oid_set(&set->set);
38 oidset_init(set, 0);
41 void oidset_parse_file(struct oidset *set, const char *path)
43 oidset_parse_file_carefully(set, path, NULL, NULL);
46 void oidset_parse_file_carefully(struct oidset *set, const char *path,
47 oidset_parse_tweak_fn fn, void *cbdata)
49 FILE *fp;
50 struct strbuf sb = STRBUF_INIT;
51 struct object_id oid;
53 fp = fopen(path, "r");
54 if (!fp)
55 die("could not open object name list: %s", path);
56 while (!strbuf_getline(&sb, fp)) {
57 const char *p;
58 const char *name;
61 * Allow trailing comments, leading whitespace
62 * (including before commits), and empty or whitespace
63 * only lines.
65 name = strchr(sb.buf, '#');
66 if (name)
67 strbuf_setlen(&sb, name - sb.buf);
68 strbuf_trim(&sb);
69 if (!sb.len)
70 continue;
72 if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
73 die("invalid object name: %s", sb.buf);
74 if (fn && fn(&oid, cbdata))
75 continue;
76 oidset_insert(set, &oid);
78 if (ferror(fp))
79 die_errno("Could not read '%s'", path);
80 fclose(fp);
81 strbuf_release(&sb);