From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 7/8] convert: drop len parameter from conversion checks
Date: Thu, 24 Jan 2019 08:12:41 -0500 [thread overview]
Message-ID: <20190124131240.GG22398@sigill.intra.peff.net> (raw)
In-Reply-To: <20190124131104.GA24017@sigill.intra.peff.net>
We've already extracted the useful information into our text_stat
struct, so the length is no longer needed.
Signed-off-by: Jeff King <peff@peff.net>
---
convert.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/convert.c b/convert.c
index 0d89ae7c23..dafd6db643 100644
--- a/convert.c
+++ b/convert.c
@@ -92,7 +92,7 @@ static void gather_stats(const char *buf, unsigned long size, struct text_stat *
* The same heuristics as diff.c::mmfile_is_binary()
* We treat files with bare CR as binary
*/
-static int convert_is_binary(unsigned long size, const struct text_stat *stats)
+static int convert_is_binary(const struct text_stat *stats)
{
if (stats->lonecr)
return 1;
@@ -110,7 +110,7 @@ static unsigned int gather_convert_stats(const char *data, unsigned long size)
if (!data || !size)
return 0;
gather_stats(data, size, &stats);
- if (convert_is_binary(size, &stats))
+ if (convert_is_binary(&stats))
ret |= CONVERT_STAT_BITS_BIN;
if (stats.crlf)
ret |= CONVERT_STAT_BITS_TXT_CRLF;
@@ -245,7 +245,7 @@ static int has_crlf_in_index(const struct index_state *istate, const char *path)
return has_crlf;
}
-static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
+static int will_convert_lf_to_crlf(struct text_stat *stats,
enum crlf_action crlf_action)
{
if (output_eol(crlf_action) != EOL_CRLF)
@@ -260,7 +260,7 @@ static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
if (stats->lonecr || stats->crlf)
return 0;
- if (convert_is_binary(len, stats))
+ if (convert_is_binary(stats))
return 0;
}
return 1;
@@ -527,7 +527,7 @@ static int crlf_to_git(const struct index_state *istate,
convert_crlf_into_lf = !!stats.crlf;
if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
- if (convert_is_binary(len, &stats))
+ if (convert_is_binary(&stats))
return 0;
/*
* If the file in the index has any CR in it, do not
@@ -549,7 +549,7 @@ static int crlf_to_git(const struct index_state *istate,
new_stats.crlf = 0;
}
/* simulate "git checkout" */
- if (will_convert_lf_to_crlf(len, &new_stats, crlf_action)) {
+ if (will_convert_lf_to_crlf(&new_stats, crlf_action)) {
new_stats.crlf += new_stats.lonelf;
new_stats.lonelf = 0;
}
@@ -601,7 +601,7 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
return 0;
gather_stats(src, len, &stats);
- if (!will_convert_lf_to_crlf(len, &stats, crlf_action))
+ if (!will_convert_lf_to_crlf(&stats, crlf_action))
return 0;
/* are we "faking" in place editing ? */
--
2.20.1.842.g8986705066
next prev parent reply other threads:[~2019-01-24 13:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 13:11 [PATCH 0/9] drop some unused parameters Jeff King
2019-01-24 13:11 ` [PATCH 1/8] match-trees: drop unused path parameter from score functions Jeff King
2019-01-24 13:11 ` [PATCH 2/8] apply: drop unused "def" parameter from find_name_gnu() Jeff King
2019-01-24 13:11 ` [PATCH 3/8] create_bundle(): drop unused "header" parameter Jeff King
2019-01-24 13:11 ` [PATCH 4/8] column: drop unused "opts" parameter in item_length() Jeff King
2019-01-24 13:12 ` [PATCH 5/8] show_date_relative(): drop unused "tz" parameter Jeff King
2019-01-24 14:07 ` Derrick Stolee
2019-01-24 13:12 ` [PATCH 6/8] config: drop unused parameter from maybe_remove_section() Jeff King
2019-01-24 13:12 ` Jeff King [this message]
2019-01-24 13:12 ` [PATCH 8/8] convert: drop path parameter from actual conversion functions Jeff King
2019-01-24 14:09 ` [PATCH 0/9] drop some unused parameters Derrick Stolee
2019-01-24 20:35 ` Junio C Hamano
2019-01-25 1:53 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124131240.GG22398@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).