quote_path: rename quote_path_relative() to quote_path()

There is no quote_path_absolute() or anything that causes confusion,
and one of the two large consumers already rename the long name
locally with a preprocessor macro.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/clean.c b/builtin/clean.c
index e53ea52d89bbb473e26666e453d549e6720a9cc2..dee44fff6e7035ca0151163061983b02e4ee55c4 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -162,7 +162,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
        if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
            is_nonbare_repository_dir(path)) {
                if (!quiet) {
-                       quote_path_relative(path->buf, prefix, &quoted);
+                       quote_path(path->buf, prefix, &quoted);
                        printf(dry_run ?  _(msg_would_skip_git_dir) : _(msg_skip_git_dir),
                                        quoted.buf);
                }
@@ -177,7 +177,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
                res = dry_run ? 0 : rmdir(path->buf);
                if (res) {
                        int saved_errno = errno;
-                       quote_path_relative(path->buf, prefix, &quoted);
+                       quote_path(path->buf, prefix, &quoted);
                        errno = saved_errno;
                        warning_errno(_(msg_warn_remove_failed), quoted.buf);
                        *dir_gone = 0;
@@ -202,7 +202,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
                        if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone))
                                ret = 1;
                        if (gone) {
-                               quote_path_relative(path->buf, prefix, &quoted);
+                               quote_path(path->buf, prefix, &quoted);
                                string_list_append(&dels, quoted.buf);
                        } else
                                *dir_gone = 0;
@@ -210,11 +210,11 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
                } else {
                        res = dry_run ? 0 : unlink(path->buf);
                        if (!res) {
-                               quote_path_relative(path->buf, prefix, &quoted);
+                               quote_path(path->buf, prefix, &quoted);
                                string_list_append(&dels, quoted.buf);
                        } else {
                                int saved_errno = errno;
-                               quote_path_relative(path->buf, prefix, &quoted);
+                               quote_path(path->buf, prefix, &quoted);
                                errno = saved_errno;
                                warning_errno(_(msg_warn_remove_failed), quoted.buf);
                                *dir_gone = 0;
@@ -238,7 +238,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
                        *dir_gone = 1;
                else {
                        int saved_errno = errno;
-                       quote_path_relative(path->buf, prefix, &quoted);
+                       quote_path(path->buf, prefix, &quoted);
                        errno = saved_errno;
                        warning_errno(_(msg_warn_remove_failed), quoted.buf);
                        *dir_gone = 0;
@@ -266,7 +266,7 @@ static void pretty_print_dels(void)
        struct column_options copts;
 
        for_each_string_list_item(item, &del_list) {
-               qname = quote_path_relative(item->string, NULL, &buf);
+               qname = quote_path(item->string, NULL, &buf);
                string_list_append(&list, qname);
        }
 
@@ -753,7 +753,7 @@ static int ask_each_cmd(void)
        for_each_string_list_item(item, &del_list) {
                /* Ctrl-D should stop removing files */
                if (!eof) {
-                       qname = quote_path_relative(item->string, NULL, &buf);
+                       qname = quote_path(item->string, NULL, &buf);
                        /* TRANSLATORS: Make sure to keep [y/N] as is */
                        printf(_("Remove %s [y/N]? "), qname);
                        if (git_read_line_interactively(&confirm) == EOF) {
@@ -1047,19 +1047,19 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                        if (remove_dirs(&abs_path, prefix, rm_flags, dry_run, quiet, &gone))
                                errors++;
                        if (gone && !quiet) {
-                               qname = quote_path_relative(item->string, NULL, &buf);
+                               qname = quote_path(item->string, NULL, &buf);
                                printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
                        }
                } else {
                        res = dry_run ? 0 : unlink(abs_path.buf);
                        if (res) {
                                int saved_errno = errno;
-                               qname = quote_path_relative(item->string, NULL, &buf);
+                               qname = quote_path(item->string, NULL, &buf);
                                errno = saved_errno;
                                warning_errno(_(msg_warn_remove_failed), qname);
                                errors++;
                        } else if (!quiet) {
-                               qname = quote_path_relative(item->string, NULL, &buf);
+                               qname = quote_path(item->string, NULL, &buf);
                                printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
                        }
                }

diff --git a/builtin/grep.c b/builtin/grep.c
index f58979bc3f07a6ca5adbd8704b1df41bf4215048..9a91ad643a2174961cab8639841a2996a13b764d 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -319,7 +319,7 @@ static void grep_source_name(struct grep_opt *opt, const char *filename,
        }
 
        if (opt->relative && opt->prefix_length)
-               quote_path_relative(filename + tree_name_len, opt->prefix, out);
+               quote_path(filename + tree_name_len, opt->prefix, out);
        else
                quote_c_style(filename + tree_name_len, out, NULL, 0);
 

diff --git a/quote.c b/quote.c
index ced0245e801861fc4744fe2a803cab40405dd078..7bb519c1a7d0c23a8d84f0670f8b9ec33fadb554 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -352,8 +352,7 @@ void write_name_quoted_relative(const char *name, const char *prefix,
 }
 
 /* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, const char *prefix,
-                         struct strbuf *out)
+char *quote_path(const char *in, const char *prefix, struct strbuf *out)
 {
        struct strbuf sb = STRBUF_INIT;
        const char *rel = relative_path(in, prefix, &sb);

diff --git a/quote.h b/quote.h
index fa09309cf6890fa82b4034dcdf957a59e0339d14..837cb42a71d31cdbf4cd1b4da34e50108c99040e 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -72,8 +72,7 @@ void write_name_quoted_relative(const char *name, const char *prefix,
                                FILE *fp, int terminator);
 
 /* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, const char *prefix,
-                         struct strbuf *out);
+char *quote_path(const char *in, const char *prefix, struct strbuf *out);
 
 /* quoting as a string literal for other languages */
 void perl_quote_buf(struct strbuf *sb, const char *src);

diff --git a/wt-status.c b/wt-status.c
index bb0f9120de40f70578867dece592eeecdf0e1e23..6b875928564fcaf2736e8c9d3aa8ebd1cdcddef0 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -259,8 +259,6 @@ static void wt_longstatus_print_trailer(struct wt_status *s)
        status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
 }
 
-#define quote_path quote_path_relative
-
 static const char *wt_status_unmerged_status_string(int stagemask)
 {
        switch (stagemask) {