undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

write_name{_quoted_relative,}(): remove redundant parameters

Browse Source 
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>
This commit is contained in:
Jiang Xin 2013-06-25 23:53:46 +08:00 committed by Junio C Hamano
parent 39598f9983
commit e9a820cefd
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/ls-files.c
View File

@ -46,15 +46,14 @@ static const char *tag_modified = "";
static const char *tag_skip_worktree = ""; static const char *tag_skip_worktree = "";
static const char *tag_resolve_undo = ""; 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() * With "--full-name", prefix_len=0; this caller needs to pass
* ignores prefix_len, so this caller needs to pass empty string * an empty string in that case (a NULL is good for "").
* in that case (a NULL is good for "").
*/ */
write_name_quoted_relative(name, len, prefix_len ? prefix : NULL, write_name_quoted_relative(name, prefix_len ? prefix : NULL,
prefix_len, stdout, line_terminator); stdout, line_terminator);
} }
static void show_dir_entry(const char *tag, struct dir_entry *ent) 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; return;
fputs(tag, stdout); fputs(tag, stdout);
write_name(ent->name, ent->len); write_name(ent->name);
} }
static void show_other_files(struct dir_struct *dir) 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), find_unique_abbrev(ce->sha1,abbrev),
ce_stage(ce)); ce_stage(ce));
} }
write_name(ce->name, ce_namelen(ce)); write_name(ce->name);
if (debug_mode) { if (debug_mode) {
printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec); 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); 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], printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
find_unique_abbrev(ui->sha1[i], abbrev), find_unique_abbrev(ui->sha1[i], abbrev),
i + 1); i + 1);
write_name(path, len); write_name(path);
} }
} }
} }

3
quote.c
View File

@ -312,8 +312,7 @@ void write_name_quotedpfx(const char *pfx, size_t pfxlen,
fputc(terminator, fp); fputc(terminator, fp);
} }
void write_name_quoted_relative(const char *name, size_t len, void write_name_quoted_relative(const char *name, const char *prefix,
const char *prefix, size_t prefix_len,
FILE *fp, int terminator) FILE *fp, int terminator)
{ {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;

3
quote.h
View File

@ -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_quoted(const char *name, FILE *, int terminator);
extern void write_name_quotedpfx(const char *pfx, size_t pfxlen, extern void write_name_quotedpfx(const char *pfx, size_t pfxlen,
const char *name, FILE *, int terminator); const char *name, FILE *, int terminator);
extern void write_name_quoted_relative(const char *name, size_t len, extern void write_name_quoted_relative(const char *name, const char *prefix,
const char *prefix, size_t prefix_len,
FILE *fp, int terminator); FILE *fp, int terminator);
/* quote path as relative to the given prefix */ /* quote path as relative to the given prefix */