From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH 2/4] convert: don't mix enum with int
Date: Tue, 15 Nov 2011 22:29:37 +0530 [thread overview]
Message-ID: <1321376379-31750-3-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1321376379-31750-1-git-send-email-artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
convert.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/convert.c b/convert.c
index 3bb5a4d..038b0be 100644
--- a/convert.c
+++ b/convert.c
@@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
return 1;
}
-static int git_path_check_crlf(const char *path, struct git_attr_check *check)
+static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check)
{
const char *value = check->value;
@@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
return CRLF_GUESS;
}
-static int git_path_check_eol(const char *path, struct git_attr_check *check)
+static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
{
const char *value = check->value;
@@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
src = dst->buf;
len = dst->len;
}
- return ret | convert_to_git(path, src, len, dst, 0);
+ return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
}
/*****************************************************************
--
1.7.6.351.gb35ac.dirty
next prev parent reply other threads:[~2011-11-15 17:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-15 16:59 [PATCH 0/4] Fix minor warnings reported by icc Ramkumar Ramachandra
2011-11-15 16:59 ` [PATCH 1/4] http: remove unused function hex() Ramkumar Ramachandra
2011-11-15 16:59 ` Ramkumar Ramachandra [this message]
2011-11-15 16:59 ` [PATCH 3/4] ll-merge: initialize default_opts const Ramkumar Ramachandra
2011-11-15 23:17 ` Junio C Hamano
2011-11-16 6:06 ` Ramkumar Ramachandra
2011-11-16 7:49 ` Junio C Hamano
2011-11-15 16:59 ` [PATCH 4/4] sha1_file: don't mix enum with int Ramkumar Ramachandra
2011-11-15 17:31 ` [PATCH 5/4] git-compat-util: don't assume value for undefined variable Ramkumar Ramachandra
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=1321376379-31750-3-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/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).