Re: [PATCH 1/5] bisect: read bisect paths with strbuf_getline()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 1, 2016, 21:30 UTC
- Message-ID
- <xmqqlh74unja.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <56ACFB03.3020000@moritzneeb.de>
Moritz Neeb <lists@moritzneeb.de> writes:
> The lines read from BISECT_NAMES are trimmed with strbuf_trim() > immediately. There is thus no logic expecting CR, so > strbuf_getline_lf() can be replaced by its CRLF counterpart.
We do not indent the whole log message.
You would also want to think about the necessity of strbuf_trim() here. Now strbuf_getline() would trim the trailing CR, would we still need to call strbuf_trim() here? The code will break if you just remove the call, but on the other hand, you will realize that the trimming done by calling it is excessive and unnecessary, once you inspect the code and learn who writes the file being read here and how.
Show 17 quoted lines
> Signed-off-by: Moritz Neeb <lists@moritzneeb.de>
> ---
> bisect.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bisect.c b/bisect.c
> index 06ec54e..bf7c885 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -440,7 +440,7 @@ static void read_bisect_paths(struct argv_array *array)
> if (!fp)
> die_errno("Could not open file '%s'", filename);
> - while (strbuf_getline_lf(&str, fp) != EOF) {
> + while (strbuf_getline(&str, fp) != EOF) {
> strbuf_trim(&str);
> if (sq_dequote_to_argv_array(str.buf, array))
> die("Badly quoted content in file '%s': %s",