summaryrefslogtreecommitdiff
path: root/credential-store.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-13 15:31:17 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-15 10:12:51 -0800
commit8f309aeb8225a9c26f20c0dbc031f1ea8df75d49 (patch)
treecc953334bfd3b2a0252a7e30154462ddaafcc4bc /credential-store.c
parentc8aa9fdf5dc15e2c508acb22df03d431983569ed (diff)
downloadgit-8f309aeb8225a9c26f20c0dbc031f1ea8df75d49.tar.gz
strbuf: introduce strbuf_getline_{lf,nul}()
The strbuf_getline() interface allows a byte other than LF or NUL as the line terminator, but this is only because I wrote these codepaths anticipating that there might be a value other than NUL and LF that could be useful when I introduced line_termination long time ago. No useful caller that uses other value has emerged. By now, it is clear that the interface is overly broad without a good reason. Many codepaths have hardcoded preference to read either LF terminated or NUL terminated records from their input, and then call strbuf_getline() with LF or NUL as the third parameter. This step introduces two thin wrappers around strbuf_getline(), namely, strbuf_getline_lf() and strbuf_getline_nul(), and mechanically rewrites these call sites to call either one of them. The changes contained in this patch are: * introduction of these two functions in strbuf.[ch] * mechanical conversion of all callers to strbuf_getline() with either '\n' or '\0' as the third parameter to instead call the respective thin wrapper. After this step, output from "git grep 'strbuf_getline('" would become a lot smaller. An interim goal of this series is to make this an empty set, so that we can have strbuf_getline_crlf() take over the shorter name strbuf_getline(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'credential-store.c')
-rw-r--r--credential-store.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/credential-store.c b/credential-store.c
index 54c4e04737..57141679ab 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -23,7 +23,7 @@ static int parse_credential_file(const char *fn,
return found_credential;
}
- while (strbuf_getline(&line, fh, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, fh) != EOF) {
credential_from_url(&entry, line.buf);
if (entry.username && entry.password &&
credential_match(c, &entry)) {