diff options
author | John Hawthorn <john@hawthorn.email> | 2019-08-16 01:09:29 -0700 |
---|---|---|
committer | John Hawthorn <john@hawthorn.email> | 2019-08-16 01:09:29 -0700 |
commit | 79e48082f579f6c02a55b7cff81ecee1c4127b29 (patch) | |
tree | 5a3662fb7b40386a686e5cdd0d5a0f8adef7f549 /src/choices.c | |
parent | c4524ae7aaa85f1569d6be1a8538b3650bc06f89 (diff) |
Simplify input_delimiter handling
Diffstat (limited to 'src/choices.c')
-rw-r--r-- | src/choices.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/choices.c b/src/choices.c index b6d5f0e..fe2f80b 100644 --- a/src/choices.c +++ b/src/choices.c @@ -46,7 +46,7 @@ static void *safe_realloc(void *buffer, size_t size) { return buffer; } -void choices_fread(choices_t *c, FILE *file) { +void choices_fread(choices_t *c, FILE *file, char input_delimiter) { /* Save current position for parsing later */ size_t buffer_start = c->buffer_size; @@ -75,7 +75,7 @@ void choices_fread(choices_t *c, FILE *file) { const char *line_end = c->buffer + c->buffer_size; char *line = c->buffer + buffer_start; do { - char *nl = strchr(line, c->input_delimiter); + char *nl = strchr(line, input_delimiter); if (nl) *nl++ = '\0'; @@ -114,12 +114,6 @@ void choices_init(choices_t *c, options_t *options) { c->worker_count = (int)sysconf(_SC_NPROCESSORS_ONLN); } - if (options->read_null) { - c->input_delimiter = '\0'; - } else { - c->input_delimiter = '\n'; - } - choices_reset_search(c); } |