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>
This commit is contained in:
14
builtin/am.c
14
builtin/am.c
@ -269,7 +269,7 @@ static char *read_shell_var(FILE *fp, const char *key)
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
const char *str;
|
||||
|
||||
if (strbuf_getline(&sb, fp, '\n'))
|
||||
if (strbuf_getline_lf(&sb, fp))
|
||||
goto fail;
|
||||
|
||||
if (!skip_prefix(sb.buf, key, &str))
|
||||
@ -558,7 +558,7 @@ static int copy_notes_for_rebase(const struct am_state *state)
|
||||
|
||||
fp = xfopen(am_path(state, "rewritten"), "r");
|
||||
|
||||
while (!strbuf_getline(&sb, fp, '\n')) {
|
||||
while (!strbuf_getline_lf(&sb, fp)) {
|
||||
unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ];
|
||||
|
||||
if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {
|
||||
@ -802,7 +802,7 @@ static int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr)
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
int subject_printed = 0;
|
||||
|
||||
while (!strbuf_getline(&sb, in, '\n')) {
|
||||
while (!strbuf_getline_lf(&sb, in)) {
|
||||
const char *str;
|
||||
|
||||
if (str_isspace(sb.buf))
|
||||
@ -860,7 +860,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
|
||||
return error(_("could not open '%s' for reading: %s"), *paths,
|
||||
strerror(errno));
|
||||
|
||||
while (!strbuf_getline(&sb, fp, '\n')) {
|
||||
while (!strbuf_getline_lf(&sb, fp)) {
|
||||
if (*sb.buf == '#')
|
||||
continue; /* skip comment lines */
|
||||
|
||||
@ -885,7 +885,7 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
|
||||
{
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
while (!strbuf_getline(&sb, in, '\n')) {
|
||||
while (!strbuf_getline_lf(&sb, in)) {
|
||||
const char *str;
|
||||
|
||||
if (skip_prefix(sb.buf, "# User ", &str))
|
||||
@ -1302,7 +1302,7 @@ static int parse_mail(struct am_state *state, const char *mail)
|
||||
|
||||
/* Extract message and author information */
|
||||
fp = xfopen(am_path(state, "info"), "r");
|
||||
while (!strbuf_getline(&sb, fp, '\n')) {
|
||||
while (!strbuf_getline_lf(&sb, fp)) {
|
||||
const char *x;
|
||||
|
||||
if (skip_prefix(sb.buf, "Subject: ", &x)) {
|
||||
@ -1368,7 +1368,7 @@ static int get_mail_commit_sha1(unsigned char *commit_id, const char *mail)
|
||||
FILE *fp = xfopen(mail, "r");
|
||||
const char *x;
|
||||
|
||||
if (strbuf_getline(&sb, fp, '\n'))
|
||||
if (strbuf_getline_lf(&sb, fp))
|
||||
return -1;
|
||||
|
||||
if (!skip_prefix(sb.buf, "From ", &x))
|
||||
|
Reference in New Issue
Block a user