Re: [PATCH v14 05/16] Refactor write_name_quoted_relative, remove unused params

2013-06-25 Thread Jiang Xin 
2013/6/25 Junio C Hamano gits...@pobox.com:
 Jiang Xin worldhello@gmail.com writes:

 -static void write_name(const char* name, size_t len)
 +static void write_name(const char *name)
  {
 - write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
 - line_terminator);
 +
 + /* turn off prefix, if run with --full-name */
 + write_name_quoted_relative(name, prefix_len ? prefix : NULL,
 +stdout, line_terminator);

 Hmmm

 Does this mean that ls-files has been broken in 03/16, because
 write_name_quoted_relative() was made to ignore prefix_len and
 measure the length of prefix with strlen(prefix), and this change
 fixes it?

I will rewrite and move this chunk to patch 03/16, but leave others
in this patch for clearity.


-- 
蒋鑫

北京群英汇信息技术有限公司
邮件: worldhello@gmail.com
网址: http://www.ossxp.com/
博客: http://www.worldhello.net/
微博: http://weibo.com/gotgit/
电话: 18601196889
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v14 05/16] Refactor write_name_quoted_relative, remove unused params

2013-06-24 Thread Jiang Xin 
After substitute path_relative() in quote.c with relative_path() from
path.c, parameters (such as len and prefix_len) are obsolete in function
write_name_quoted_relative(). Remove unused parameters from
write_name_quoted_relative() and related functions.

Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
 builtin/ls-files.c | 14 --
 quote.c|  3 +--
 quote.h|  3 +--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 16d4f..df83f9 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -46,10 +46,12 @@ static const char *tag_modified = ;
 static const char *tag_skip_worktree = ;
 static const char *tag_resolve_undo = ;
 
-static void write_name(const char* name, size_t len)
+static void write_name(const char *name)
 {
-   write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
-   line_terminator);
+
+   /* turn off prefix, if run with --full-name */
+   write_name_quoted_relative(name, prefix_len ? prefix : NULL,
+  stdout, line_terminator);
 }
 
 static void show_dir_entry(const char *tag, struct dir_entry *ent)
@@ -63,7 +65,7 @@ static void show_dir_entry(const char *tag, struct dir_entry 
*ent)
return;
 
fputs(tag, stdout);
-   write_name(ent-name, ent-len);
+   write_name(ent-name);
 }
 
 static void show_other_files(struct dir_struct *dir)
@@ -163,7 +165,7 @@ static void show_ce_entry(const char *tag, struct 
cache_entry *ce)
   find_unique_abbrev(ce-sha1,abbrev),
   ce_stage(ce));
}
-   write_name(ce-name, ce_namelen(ce));
+   write_name(ce-name);
if (debug_mode) {
struct stat_data *sd = ce-ce_stat_data;
 
@@ -198,7 +200,7 @@ static void show_ru_info(void)
printf(%s%06o %s %d\t, tag_resolve_undo, ui-mode[i],
   find_unique_abbrev(ui-sha1[i], abbrev),
   i + 1);
-   write_name(path, len);
+   write_name(path);
}
}
 }
diff --git a/quote.c b/quote.c
index ebb8..5c880 100644
--- a/quote.c
+++ b/quote.c
@@ -312,8 +312,7 @@ void write_name_quotedpfx(const char *pfx, size_t pfxlen,
fputc(terminator, fp);
 }
 
-void write_name_quoted_relative(const char *name, size_t len,
-   const char *prefix, size_t prefix_len,
+void write_name_quoted_relative(const char *name, const char *prefix,
FILE *fp, int terminator)
 {
struct strbuf sb = STRBUF_INIT;
diff --git a/quote.h b/quote.h
index 5610159..ed110 100644
--- a/quote.h
+++ b/quote.h
@@ -60,8 +60,7 @@ extern void quote_two_c_style(struct strbuf *, const char *, 
const char *, int);
 extern void write_name_quoted(const char *name, FILE *, int terminator);
 extern void write_name_quotedpfx(const char *pfx, size_t pfxlen,
  const char *name, FILE *, int terminator);
-extern void write_name_quoted_relative(const char *name, size_t len,
-   const char *prefix, size_t prefix_len,
+extern void write_name_quoted_relative(const char *name, const char *prefix,
FILE *fp, int terminator);
 
 /* quote path as relative to the given prefix */
-- 
1.8.3.1.756.g41beab0

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v14 05/16] Refactor write_name_quoted_relative, remove unused params

2013-06-24 Thread Junio C Hamano 
Jiang Xin worldhello@gmail.com writes:

 -static void write_name(const char* name, size_t len)
 +static void write_name(const char *name)
  {
 - write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
 - line_terminator);
 +
 + /* turn off prefix, if run with --full-name */
 + write_name_quoted_relative(name, prefix_len ? prefix : NULL,
 +stdout, line_terminator);

Hmmm

Does this mean that ls-files has been broken in 03/16, because
write_name_quoted_relative() was made to ignore prefix_len and
measure the length of prefix with strlen(prefix), and this change
fixes it?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html