summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2013-06-25 15:53:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-26 18:22:06 (GMT)
commite9a820cefde2170840fbcdf7c4b74369988869dc (patch)
tree12024a35f95bb2258f739da70ec6480428054c00 /builtin
parent39598f9983f759b5e38b9e762c695bad6c89a1b3 (diff)
downloadgit-e9a820cefde2170840fbcdf7c4b74369988869dc.zip
git-e9a820cefde2170840fbcdf7c4b74369988869dc.tar.gz
git-e9a820cefde2170840fbcdf7c4b74369988869dc.tar.bz2
write_name{_quoted_relative,}(): remove redundant parameters
After substitute path_relative() in quote.c with relative_path() from path.c, parameters (such as len and prefix_len) are redundant in function write_name() and write_name_quoted_relative(). The callers have already been audited that the strings they pass are properly NUL terminated and the length they give are the length of the string (or -1 that asks the length to be counted by the callee). Remove these now-redundant parameters. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-files.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 48c82e8..29d45b4 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -46,15 +46,14 @@ 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)
{
/*
- * With "--full-name", prefix_len=0; write_name_quoted_relative()
- * ignores prefix_len, so this caller needs to pass empty string
- * in that case (a NULL is good for "").
+ * With "--full-name", prefix_len=0; this caller needs to pass
+ * an empty string in that case (a NULL is good for "").
*/
- write_name_quoted_relative(name, len, prefix_len ? prefix : NULL,
- prefix_len, stdout, line_terminator);
+ write_name_quoted_relative(name, prefix_len ? prefix : NULL,
+ stdout, line_terminator);
}
static void show_dir_entry(const char *tag, struct dir_entry *ent)
@@ -68,7 +67,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)
@@ -168,7 +167,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) {
printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec);
printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec);
@@ -201,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);
}
}
}