From f93895f8fcf1a45e594cd28c03b88a057382dc6b Mon Sep 17 00:00:00 2001 From: Barret Rhoden Date: Wed, 15 May 2019 17:44:57 -0400 Subject: Move oidset_parse_file() to oidset.c Signed-off-by: Barret Rhoden Signed-off-by: Junio C Hamano --- fsck.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'fsck.c') diff --git a/fsck.c b/fsck.c index 9878a4b104..80b53e6f49 100644 --- a/fsck.c +++ b/fsck.c @@ -181,41 +181,6 @@ static int fsck_msg_type(enum fsck_msg_id msg_id, return msg_type; } -void oidset_parse_file(struct oidset *set, const char *path) -{ - FILE *fp; - struct strbuf sb = STRBUF_INIT; - struct object_id oid; - - fp = fopen(path, "r"); - if (!fp) - die("could not open object name list: %s", path); - while (!strbuf_getline(&sb, fp)) { - const char *p; - const char *name; - - /* - * Allow trailing comments, leading whitespace - * (including before commits), and empty or whitespace - * only lines. - */ - name = strchr(sb.buf, '#'); - if (name) - strbuf_setlen(&sb, name - sb.buf); - strbuf_trim(&sb); - if (!sb.len) - continue; - - if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0') - die("invalid object name: %s", sb.buf); - oidset_insert(set, &oid); - } - if (ferror(fp)) - die_errno("Could not read '%s'", path); - fclose(fp); - strbuf_release(&sb); -} - static int parse_msg_type(const char *str) { if (!strcmp(str, "error")) -- cgit v1.2.3