diff options
Diffstat (limited to 'convert.c')
| -rw-r--r-- | convert.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -195,9 +195,9 @@ static void check_global_conv_flags_eol(const char *path, if (conv_flags & CONV_EOL_RNDTRP_DIE) die(_("CRLF would be replaced by LF in %s"), path); else if (conv_flags & CONV_EOL_RNDTRP_WARN) - warning(_("CRLF will be replaced by LF in %s.\n" - "The file will have its original line" - " endings in your working directory"), path); + warning(_("in the working copy of '%s', CRLF will be" + " replaced by LF the next time Git touches" + " it"), path); } else if (old_stats->lonelf && !new_stats->lonelf ) { /* * CRLFs would be added by checkout @@ -205,9 +205,9 @@ static void check_global_conv_flags_eol(const char *path, if (conv_flags & CONV_EOL_RNDTRP_DIE) die(_("LF would be replaced by CRLF in %s"), path); else if (conv_flags & CONV_EOL_RNDTRP_WARN) - warning(_("LF will be replaced by CRLF in %s.\n" - "The file will have its original line" - " endings in your working directory"), path); + warning(_("in the working copy of '%s', LF will be" + " replaced by CRLF the next time Git touches" + " it"), path); } } @@ -619,7 +619,7 @@ struct filter_params { const char *path; }; -static int filter_buffer_or_fd(int in, int out, void *data) +static int filter_buffer_or_fd(int in UNUSED, int out, void *data) { /* * Spawn cmd and feed the buffer contents through its stdin. @@ -1008,7 +1008,7 @@ static int apply_filter(const char *path, const char *src, size_t len, return 0; } -static int read_convert_config(const char *var, const char *value, void *cb) +static int read_convert_config(const char *var, const char *value, void *cb UNUSED) { const char *key, *name; size_t namelen; @@ -1549,7 +1549,7 @@ struct stream_filter { struct stream_filter_vtbl *vtbl; }; -static int null_filter_fn(struct stream_filter *filter, +static int null_filter_fn(struct stream_filter *filter UNUSED, const char *input, size_t *isize_p, char *output, size_t *osize_p) { @@ -1568,7 +1568,7 @@ static int null_filter_fn(struct stream_filter *filter, return 0; } -static void null_free_fn(struct stream_filter *filter) +static void null_free_fn(struct stream_filter *filter UNUSED) { ; /* nothing -- null instances are shared */ } |